diff --git a/liblockdev.spec b/liblockdev.spec index e9de35d..8b3dc19 100644 --- a/liblockdev.spec +++ b/liblockdev.spec @@ -2,7 +2,7 @@ %define majver %(echo %version | cut -d_ -f1) %define minver %(echo %version | cut -d_ -f2) Name: liblockdev -Version: 1.0.3_1.5 +Version: 1.0.3_1.6 Release: 1mamba Summary: A library to put an exclusive lock to devices Group: System/Kernel and Hardware @@ -18,6 +18,8 @@ Patch3: %{name}-1.0.0-signal.patch Patch4: %{name}-1.0.0-cli.patch Patch5: %{name}-1.0.1-checkname.patch License: LGPL +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -59,7 +61,9 @@ install -d %{buildroot}/var/lock/subsys %post /sbin/ldconfig -groupadd tty -g %{tty_groupid} 2>/dev/null +if [ $1 -ge 1 ]; then + groupadd tty -g %{tty_groupid} 2>/dev/null || true +fi : %postun -p /sbin/ldconfig @@ -78,6 +82,9 @@ groupadd tty -g %{tty_groupid} 2>/dev/null %{_mandir}/man3/* %changelog +* Sun Nov 16 2014 Silvan Calarco 1.0.3_1.6-1mamba +- update to 1.0.3_1.6 + * Sat Apr 27 2013 Automatic Build System 1.0.3_1.5-1mamba - update to 1.0.3_1.5 diff --git a/lockdev_1.0.3-1.5.diff b/lockdev_1.0.3-1.6.diff similarity index 97% rename from lockdev_1.0.3-1.5.diff rename to lockdev_1.0.3-1.6.diff index 020c035..8fb98e2 100644 --- a/lockdev_1.0.3-1.5.diff +++ b/lockdev_1.0.3-1.6.diff @@ -1,14 +1,28 @@ ---- lockdev-1.0.3.orig/debian/liblockdev1-dbg.docs -+++ lockdev-1.0.3/debian/liblockdev1-dbg.docs -@@ -0,0 +1 @@ -+README.debug ---- lockdev-1.0.3.orig/debian/compat -+++ lockdev-1.0.3/debian/compat -@@ -0,0 +1 @@ -+4 +--- lockdev-1.0.3.orig/debian/NEWS ++++ lockdev-1.0.3/debian/NEWS +@@ -0,0 +1,8 @@ ++lockdev (1.0.3-1.1) unstable; urgency=low ++ ++ The format of device lock files has changed. ++ ++ All programs that have locked device files using the old version of ++ liblockdev needs to be restarted. ++ ++ -- Andreas Barth Mon, 27 Nov 2006 13:13:37 +0100 --- lockdev-1.0.3.orig/debian/changelog +++ lockdev-1.0.3/debian/changelog -@@ -0,0 +1,341 @@ +@@ -0,0 +1,352 @@ ++lockdev (1.0.3-1.6) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Fix "hardcodes /usr/lib/perl5": ++ debian/rules: ++ - use $Config{vendorarch} for getting correct directory ++ - revamp install target for perl library ++ (Closes: #752714) ++ ++ -- gregor herrmann Sat, 02 Aug 2014 18:49:34 +0200 ++ +lockdev (1.0.3-1.5) unstable; urgency=low + + * Non-maintainer upload. @@ -350,9 +364,169 @@ + * Initial Release. + + -- Fabrizio Polacco Thu, 4 Sep 1997 14:13:23 +0300 +--- lockdev-1.0.3.orig/debian/compat ++++ lockdev-1.0.3/debian/compat +@@ -0,0 +1 @@ ++4 +--- lockdev-1.0.3.orig/debian/control ++++ lockdev-1.0.3/debian/control +@@ -0,0 +1,55 @@ ++Source: lockdev ++Section: libs ++Priority: optional ++Maintainer: Paweł Więcek ++Uploaders: Roger Leigh ++Standards-Version: 3.6.2 ++Build-Depends: perl (>= 5.8.0-7), debhelper (>= 4.0.0) ++ ++Package: liblockdev1 ++Section: libs ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: Run-time shared library for locking devices ++ It provides a reliable way to put an exclusive lock to ++ devices using _both_ FSSTND and SVr4 methods. ++ ++Package: liblockdev1-dev ++Section: libdevel ++Architecture: any ++Depends: liblockdev1 (= ${binary:Version}), libc6-dev, ${misc:Depends} ++Conflicts: liblockdev0-dev, liblockdev0g-dev ++Replaces: liblockdev0-dev, liblockdev0g-dev ++Description: Development library for locking devices ++ It provides a reliable way to put an exclusive lock to ++ devices using _both_ FSSTND and SVr4 methods. ++ . ++ Includes header files and static lib. ++ ++Package: liblockdev1-dbg ++Section: debug ++Priority: extra ++Architecture: any ++Depends: liblockdev1 (= ${binary:Version}), liblockdev1-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} ++Conflicts: liblockdev0-dbg, liblockdev0g-dbg ++Replaces: liblockdev0-dbg, liblockdev0g-dbg ++Description: Debugging library for locking devices ++ It provides a reliable way to put an exclusive lock to ++ devices using _both_ FSSTND and SVr4 methods. ++ . ++ Includes static and shared debugging and profiling libs, ++ as well as the sources ready for use by gdb. ++ ++Package: liblockdev1-perl ++Section: perl ++Architecture: any ++Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} ++Conflicts: liblockdev0-perl ++Replaces: liblockdev0-perl ++Description: perl extension library for locking devices ++ It provides a reliable way to put an exclusive lock to ++ devices using _both_ FSSTND and SVr4 methods. ++ . ++ Includes a shared lib loadable by perl 5 (use LockDev), ++ the module LockDev.pm and its manpage LockDev(3pm) . ++ +--- lockdev-1.0.3.orig/debian/copyright ++++ lockdev-1.0.3/debian/copyright +@@ -0,0 +1,49 @@ ++liblockdev is (c) 1997, 1999 by Fabrizio Polacco ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License (LGPL) as published by the Free Software Foundation; ++ version 2.1 dated February 1999. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General ++ Public License (LGPL) along with this program; if not, write ++ to the Free Software Foundation, Inc., ++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++On Debian GNU/Linux systems, the complete text of the GNU Library General ++Public License can be found in `/usr/share/common-licenses/LGPL'. ++ ++It's primary source is the Debian archives: ++ ftp://ftp.debian.org/debian/pool/main/l/lockdev/ ++ ++================ CREDITS ================ ++ ++Barak Pearlmutter ++ - code revision ++ - suggestion for the use of the semaphore. ++Juan Cespedes ++ - code revision ++Daniel Quinlan ++ - suggestion to support the cua devices. ++ - suggestions for naming of functions. ++Raphael Hertzog ++ - NMU for new perl ++Adam P. Harris ++ - changes in debian postinst. ++Martin Schulze ++ - changes in perl makefile ++ - suggestions for changes in assembler stage for debug. ++Hamish Moffatt, James Troup ++ - dependencies check. ++Yann Dirson ++ - suggestions for a debugging shared library. ++Roger Leigh ++ - updated to ISO C89 C. ++ - work with modern glibc dev_t. ++ - work with devices in subdirectories, á la DevFS ++ +--- lockdev-1.0.3.orig/debian/liblockdev1-dbg.dirs ++++ lockdev-1.0.3/debian/liblockdev1-dbg.dirs +@@ -0,0 +1 @@ ++usr/share/doc/liblockdev1 +--- lockdev-1.0.3.orig/debian/liblockdev1-dbg.docs ++++ lockdev-1.0.3/debian/liblockdev1-dbg.docs +@@ -0,0 +1 @@ ++README.debug +--- lockdev-1.0.3.orig/debian/liblockdev1-dev.dirs ++++ lockdev-1.0.3/debian/liblockdev1-dev.dirs +@@ -0,0 +1,2 @@ ++usr/share/man/man3 ++usr/share/doc +--- lockdev-1.0.3.orig/debian/liblockdev1-dev.manpages ++++ lockdev-1.0.3/debian/liblockdev1-dev.manpages +@@ -0,0 +1 @@ ++docs/lockdev.3 +--- lockdev-1.0.3.orig/debian/liblockdev1-perl.dirs ++++ lockdev-1.0.3/debian/liblockdev1-perl.dirs +@@ -0,0 +1 @@ ++usr/share/perl5 +--- lockdev-1.0.3.orig/debian/liblockdev1.postinst ++++ lockdev-1.0.3/debian/liblockdev1.postinst +@@ -0,0 +1,22 @@ ++#!/bin/sh -e ++ ++if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl 1.0.3-1; ++then ++ echo ++ echo "WARNING" ++ echo "Format of device lock files have changed, you will need to restart all" ++ echo "programs that have locked device files using the old version of liblockdev." ++ echo ++ ++ if ls /var/lock/LCK.[0-9]* 2>/dev/null ++ then ++ echo "Right now the following programs use old lockfiles:" ++ echo ++ ps -p `cat /var/lock/LCK.[0-9]*` ++ echo ++ fi ++fi ++ ++#DEBHELPER# ++ ++exit 0 --- lockdev-1.0.3.orig/debian/rules +++ lockdev-1.0.3/debian/rules -@@ -0,0 +1,145 @@ +@@ -0,0 +1,133 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. @@ -361,19 +535,7 @@ +#export DH_VERBOSE=1 + + -+ifndef PERL -+PERL = /usr/bin/perl -+endif -+ -+archlib = `$(PERL) -MConfig -e 'print $$Config{installarchlib}'` -+config = INSTALLDIRS=vendor -+config += INSTALLMAN1DIR=${d_man}/man1 -+config += INSTALLMAN3DIR=${d_man}/man3 -+config += INSTALLPRIVLIB=${d_ulib}/perl5 -+config += INSTALLARCHLIB=${d_build}$(archlib) -+PERLVERSION=`$(PERL) -MConfig -e 'print $$Config{version}'` -+ -+ ++PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}') + +CFLAGS = -Wall -g + @@ -433,9 +595,9 @@ + $(MAKE) install_debug basedir=$(CURDIR)/debian/liblockdev1-dbg/usr + $(MAKE) install_profile basedir=$(CURDIR)/debian/liblockdev1-dbg/usr + $(MAKE) install_dev basedir=$(CURDIR)/debian/liblockdev1-dev/usr -+ cd LockDev && $(MAKE) pure_install $(config) PREFIX=$(CURDIR)/debian/liblockdev1-perl/usr ++ cd LockDev && $(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/liblockdev1-perl + -+ mv $(CURDIR)/debian/liblockdev1-perl/usr/lib/perl5/LockDev.pm \ ++ mv $(CURDIR)/debian/liblockdev1-perl$(PERL_ARCHLIB)/LockDev.pm \ + $(CURDIR)/debian/liblockdev1-perl/usr/share/perl5 + + ln -s lockdev.3.gz \ @@ -498,169 +660,6 @@ + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure ---- lockdev-1.0.3.orig/debian/liblockdev1-dev.manpages -+++ lockdev-1.0.3/debian/liblockdev1-dev.manpages -@@ -0,0 +1 @@ -+docs/lockdev.3 ---- lockdev-1.0.3.orig/debian/liblockdev1-dbg.dirs -+++ lockdev-1.0.3/debian/liblockdev1-dbg.dirs -@@ -0,0 +1 @@ -+usr/share/doc/liblockdev1 ---- lockdev-1.0.3.orig/debian/control -+++ lockdev-1.0.3/debian/control -@@ -0,0 +1,55 @@ -+Source: lockdev -+Section: libs -+Priority: optional -+Maintainer: Paweł Więcek -+Uploaders: Roger Leigh -+Standards-Version: 3.6.2 -+Build-Depends: perl (>= 5.8.0-7), debhelper (>= 4.0.0) -+ -+Package: liblockdev1 -+Section: libs -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends} -+Description: Run-time shared library for locking devices -+ It provides a reliable way to put an exclusive lock to -+ devices using _both_ FSSTND and SVr4 methods. -+ -+Package: liblockdev1-dev -+Section: libdevel -+Architecture: any -+Depends: liblockdev1 (= ${binary:Version}), libc6-dev, ${misc:Depends} -+Conflicts: liblockdev0-dev, liblockdev0g-dev -+Replaces: liblockdev0-dev, liblockdev0g-dev -+Description: Development library for locking devices -+ It provides a reliable way to put an exclusive lock to -+ devices using _both_ FSSTND and SVr4 methods. -+ . -+ Includes header files and static lib. -+ -+Package: liblockdev1-dbg -+Section: debug -+Priority: extra -+Architecture: any -+Depends: liblockdev1 (= ${binary:Version}), liblockdev1-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Conflicts: liblockdev0-dbg, liblockdev0g-dbg -+Replaces: liblockdev0-dbg, liblockdev0g-dbg -+Description: Debugging library for locking devices -+ It provides a reliable way to put an exclusive lock to -+ devices using _both_ FSSTND and SVr4 methods. -+ . -+ Includes static and shared debugging and profiling libs, -+ as well as the sources ready for use by gdb. -+ -+Package: liblockdev1-perl -+Section: perl -+Architecture: any -+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} -+Conflicts: liblockdev0-perl -+Replaces: liblockdev0-perl -+Description: perl extension library for locking devices -+ It provides a reliable way to put an exclusive lock to -+ devices using _both_ FSSTND and SVr4 methods. -+ . -+ Includes a shared lib loadable by perl 5 (use LockDev), -+ the module LockDev.pm and its manpage LockDev(3pm) . -+ ---- lockdev-1.0.3.orig/debian/liblockdev1-perl.dirs -+++ lockdev-1.0.3/debian/liblockdev1-perl.dirs -@@ -0,0 +1 @@ -+usr/share/perl5 ---- lockdev-1.0.3.orig/debian/liblockdev1-dev.dirs -+++ lockdev-1.0.3/debian/liblockdev1-dev.dirs -@@ -0,0 +1,2 @@ -+usr/share/man/man3 -+usr/share/doc ---- lockdev-1.0.3.orig/debian/NEWS -+++ lockdev-1.0.3/debian/NEWS -@@ -0,0 +1,8 @@ -+lockdev (1.0.3-1.1) unstable; urgency=low -+ -+ The format of device lock files has changed. -+ -+ All programs that have locked device files using the old version of -+ liblockdev needs to be restarted. -+ -+ -- Andreas Barth Mon, 27 Nov 2006 13:13:37 +0100 ---- lockdev-1.0.3.orig/debian/liblockdev1.postinst -+++ lockdev-1.0.3/debian/liblockdev1.postinst -@@ -0,0 +1,22 @@ -+#!/bin/sh -e -+ -+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl 1.0.3-1; -+then -+ echo -+ echo "WARNING" -+ echo "Format of device lock files have changed, you will need to restart all" -+ echo "programs that have locked device files using the old version of liblockdev." -+ echo -+ -+ if ls /var/lock/LCK.[0-9]* 2>/dev/null -+ then -+ echo "Right now the following programs use old lockfiles:" -+ echo -+ ps -p `cat /var/lock/LCK.[0-9]*` -+ echo -+ fi -+fi -+ -+#DEBHELPER# -+ -+exit 0 ---- lockdev-1.0.3.orig/debian/copyright -+++ lockdev-1.0.3/debian/copyright -@@ -0,0 +1,49 @@ -+liblockdev is (c) 1997, 1999 by Fabrizio Polacco -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License (LGPL) as published by the Free Software Foundation; -+ version 2.1 dated February 1999. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General -+ Public License (LGPL) along with this program; if not, write -+ to the Free Software Foundation, Inc., -+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+On Debian GNU/Linux systems, the complete text of the GNU Library General -+Public License can be found in `/usr/share/common-licenses/LGPL'. -+ -+It's primary source is the Debian archives: -+ ftp://ftp.debian.org/debian/pool/main/l/lockdev/ -+ -+================ CREDITS ================ -+ -+Barak Pearlmutter -+ - code revision -+ - suggestion for the use of the semaphore. -+Juan Cespedes -+ - code revision -+Daniel Quinlan -+ - suggestion to support the cua devices. -+ - suggestions for naming of functions. -+Raphael Hertzog -+ - NMU for new perl -+Adam P. Harris -+ - changes in debian postinst. -+Martin Schulze -+ - changes in perl makefile -+ - suggestions for changes in assembler stage for debug. -+Hamish Moffatt, James Troup -+ - dependencies check. -+Yann Dirson -+ - suggestions for a debugging shared library. -+Roger Leigh -+ - updated to ISO C89 C. -+ - work with modern glibc dev_t. -+ - work with devices in subdirectories, á la DevFS -+ --- lockdev-1.0.3.orig/src/lockdev.c +++ lockdev-1.0.3/src/lockdev.c @@ -125,14 +125,23 @@