From ef050c909893eefc6a8838be0eab99737ae74a3b Mon Sep 17 00:00:00 2001 From: kzak Date: Mon, 6 Oct 2008 09:37:43 +0000 Subject: [PATCH] - refresh patches (due --fuzz=0) - fix compiler warnings --- lockdev-1.0.0-rh.patch | 75 ++++++++++++++++++++----------------- lockdev-1.0.0-shared.patch | 10 +++-- lockdev-1.0.1-gccwarn.patch | 21 +++++++++++ lockdev.spec | 10 ++++- 4 files changed, 75 insertions(+), 41 deletions(-) create mode 100644 lockdev-1.0.1-gccwarn.patch diff --git a/lockdev-1.0.0-rh.patch b/lockdev-1.0.0-rh.patch index 6e3a4e7..0b6a91a 100644 --- a/lockdev-1.0.0-rh.patch +++ b/lockdev-1.0.0-rh.patch @@ -1,7 +1,8 @@ -diff -uNr lockdev-1.0.0.orig/Makefile lockdev-1.0.0/Makefile ---- lockdev-1.0.0.orig/Makefile Wed Dec 1 05:56:22 1999 -+++ lockdev-1.0.0/Makefile Fri Oct 26 11:40:18 2001 -@@ -6,6 +6,8 @@ +Index: lockdev-1.0.1/Makefile +=================================================================== +--- lockdev-1.0.1.orig/Makefile ++++ lockdev-1.0.1/Makefile +@@ -5,6 +5,8 @@ pkgname = lockdev objs = src/lockdev.o @@ -10,7 +11,7 @@ diff -uNr lockdev-1.0.0.orig/Makefile lockdev-1.0.0/Makefile VER = $(shell expr `pwd` : '.*-\([0-9.]*\)') MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'} -@@ -18,17 +20,18 @@ +@@ -17,17 +19,18 @@ soname = ${libname}.so.${MVER} basedir = /usr/local srcdir=. @@ -32,7 +33,7 @@ diff -uNr lockdev-1.0.0.orig/Makefile lockdev-1.0.0/Makefile static ${static}: ${objs} $(AR) $(ARFLAGS) ${static} $^ -@@ -36,6 +39,11 @@ +@@ -35,6 +38,11 @@ static ${static}: ${objs} shared ${shared}: ${objs} ${CC} ${LCFLAGS} -shared -Wl,-soname,${soname} $^ -lc -o ${shared} @@ -43,8 +44,8 @@ diff -uNr lockdev-1.0.0.orig/Makefile lockdev-1.0.0/Makefile + ${CC} -o $@ $^ perl-lib: static - cd LockDev && perl Makefile.PL INSTALLDIRS=perl -@@ -51,6 +59,7 @@ + cd LockDev && perl Makefile.PL INSTALLDIRS=vendor +@@ -50,6 +58,7 @@ install_dev: ${static} src/lockdev.h install -m755 -d ${incdir} install -m644 src/lockdev.h ${incdir} install -m644 src/ttylock.h ${incdir} @@ -52,7 +53,7 @@ diff -uNr lockdev-1.0.0.orig/Makefile lockdev-1.0.0/Makefile install_debug: ${static} ${shared} install -m755 -d ${libdir}/debug -@@ -68,7 +77,9 @@ +@@ -67,7 +76,9 @@ install_doc: docs/lockdev.3 install_run: ${shared} install -m755 -d ${libdir} @@ -63,9 +64,10 @@ diff -uNr lockdev-1.0.0.orig/Makefile lockdev-1.0.0/Makefile .PHONY: clean distclean perl-clean mostyclean perl-clean: clean -diff -uNr lockdev-1.0.0.orig/src/baudboy.h lockdev-1.0.0/src/baudboy.h ---- lockdev-1.0.0.orig/src/baudboy.h Wed Dec 31 19:00:00 1969 -+++ lockdev-1.0.0/src/baudboy.h Fri Oct 26 11:40:26 2001 +Index: lockdev-1.0.1/src/baudboy.h +=================================================================== +--- /dev/null ++++ lockdev-1.0.1/src/baudboy.h @@ -0,0 +1,136 @@ +/* Copyright (C) 2001 Red Hat, Inc. + @@ -203,10 +205,11 @@ diff -uNr lockdev-1.0.0.orig/src/baudboy.h lockdev-1.0.0/src/baudboy.h +#endif + +#endif /* _BAUDBOY_H_ */ -diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c ---- lockdev-1.0.0.orig/src/lockdev.c Wed Dec 1 06:43:47 1999 -+++ lockdev-1.0.0/src/lockdev.c Fri Oct 26 11:40:18 2001 -@@ -176,6 +176,19 @@ +Index: lockdev-1.0.1/src/lockdev.c +=================================================================== +--- lockdev-1.0.1.orig/src/lockdev.c ++++ lockdev-1.0.1/src/lockdev.c +@@ -176,6 +176,19 @@ liblockdev_reset_debug() liblockdev_debug = 0; } @@ -226,7 +229,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c /* * for internal use * -@@ -429,7 +442,7 @@ +@@ -429,7 +442,7 @@ _dl_check_lock( lockname) * maybe also this sprintf should be added to the * conditional part, as the others */ @@ -235,7 +238,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c unlink( tpname); /* in case there was */ rename( lockname, tpname); if ( ! (fd=fopen( tpname, "r")) ) { -@@ -520,7 +533,7 @@ +@@ -520,7 +533,7 @@ dev_testlock( devname) * and minor numbers */ if ( stat( device, &statbuf) == -1 ) { @@ -244,7 +247,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c } /* first check for the FSSTND-1.2 lock, get the pid of the -@@ -586,7 +599,7 @@ +@@ -586,7 +599,7 @@ dev_lock( devname) #endif /* DEBUG */ _debug( 3, "dev_lock(%s)\n", devname); if (oldmask == -1 ) @@ -253,7 +256,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c if ( ! (p=_dl_check_devname( devname)) ) close_n_return( -1); strcpy( device, DEV_PATH); -@@ -597,11 +610,14 @@ +@@ -597,11 +610,14 @@ dev_lock( devname) * and minor numbers */ if ( stat( device, &statbuf) == -1 ) { @@ -270,7 +273,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c _debug( 2, "dev_lock() our own pid = %d\n", (int)our_pid); /* We will use this algorithm: -@@ -642,8 +658,9 @@ +@@ -642,8 +658,9 @@ dev_lock( devname) _dl_filename_1( lock1, &statbuf); while ( ! (pid=_dl_check_lock( lock1)) ) { if (( link( lock0, lock1) == -1 ) && ( errno != EEXIST )) { @@ -281,7 +284,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c } } if ( pid != our_pid ) { -@@ -660,9 +677,10 @@ +@@ -660,9 +677,10 @@ dev_lock( devname) /* lockfile of type /var/lock/LCK..ttyS2 */ while ( ! (pid=_dl_check_lock( lock2)) ) { if (( link( lock0, lock2) == -1 ) && ( errno != EEXIST )) { @@ -293,7 +296,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c } } if ( pid != our_pid ) { -@@ -742,7 +760,7 @@ +@@ -742,7 +760,7 @@ dev_relock( devname, old_pid) #endif /* DEBUG */ _debug( 3, "dev_relock(%s, %d)\n", devname, (int)old_pid); if (oldmask == -1 ) @@ -302,7 +305,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c if ( ! (p=_dl_check_devname( devname)) ) close_n_return( -1); strcpy( device, DEV_PATH); -@@ -753,11 +771,14 @@ +@@ -753,11 +771,14 @@ dev_relock( devname, old_pid) * and minor numbers */ if ( stat( device, &statbuf) == -1 ) { @@ -319,7 +322,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c _debug( 2, "dev_relock() our own pid = %d\n", (int)our_pid); /* first check for the FSSTND-1.2 lock, get the pid of the -@@ -828,7 +849,7 @@ +@@ -828,7 +849,7 @@ dev_unlock( devname, pid) #endif /* DEBUG */ _debug( 3, "dev_unlock(%s, %d)\n", devname, (int)pid); if (oldmask == -1 ) @@ -328,7 +331,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c if ( ! (p=_dl_check_devname( devname)) ) close_n_return( -1); strcpy( device, DEV_PATH); -@@ -839,7 +860,10 @@ +@@ -839,7 +860,10 @@ dev_unlock( devname, pid) * and minor numbers */ if ( stat( device, &statbuf) == -1 ) { @@ -340,10 +343,11 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.c lockdev-1.0.0/src/lockdev.c } /* first remove the FSSTND-1.2 lock, get the pid of the -diff -uNr lockdev-1.0.0.orig/src/lockdev.h lockdev-1.0.0/src/lockdev.h ---- lockdev-1.0.0.orig/src/lockdev.h Wed Dec 1 06:39:42 1999 -+++ lockdev-1.0.0/src/lockdev.h Fri Oct 26 11:40:18 2001 -@@ -53,6 +53,7 @@ +Index: lockdev-1.0.1/src/lockdev.h +=================================================================== +--- lockdev-1.0.1.orig/src/lockdev.h ++++ lockdev-1.0.1/src/lockdev.h +@@ -53,6 +53,7 @@ extern "C" { #endif #include @@ -351,7 +355,7 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.h lockdev-1.0.0/src/lockdev.h /* API of the library */ -@@ -60,6 +61,9 @@ +@@ -60,6 +61,9 @@ extern "C" { void liblockdev_incr_debug __P(()); void liblockdev_reset_debug __P(()); @@ -361,9 +365,10 @@ diff -uNr lockdev-1.0.0.orig/src/lockdev.h lockdev-1.0.0/src/lockdev.h pid_t dev_testlock __P(( const char * devname)); pid_t dev_lock __P(( const char * devname)); -diff -uNr lockdev-1.0.0.orig/src/sample.c lockdev-1.0.0/src/sample.c ---- lockdev-1.0.0.orig/src/sample.c Wed Dec 1 06:50:09 1999 -+++ lockdev-1.0.0/src/sample.c Fri Oct 26 11:40:18 2001 +Index: lockdev-1.0.1/src/sample.c +=================================================================== +--- lockdev-1.0.1.orig/src/sample.c ++++ lockdev-1.0.1/src/sample.c @@ -3,27 +3,26 @@ void @@ -400,7 +405,7 @@ diff -uNr lockdev-1.0.0.orig/src/sample.c lockdev-1.0.0/src/sample.c case 'd': debug = atoi(++p); break; -@@ -32,31 +31,52 @@ +@@ -32,31 +31,52 @@ main( int argc, char *argv[] ) } else dev = p; } diff --git a/lockdev-1.0.0-shared.patch b/lockdev-1.0.0-shared.patch index d5c9993..fc7c603 100644 --- a/lockdev-1.0.0-shared.patch +++ b/lockdev-1.0.0-shared.patch @@ -1,6 +1,8 @@ ---- lockdev-1.0.0/Makefile Mon Feb 25 15:36:06 2002 -+++ lockdev-1.0.0/Makefile Mon Feb 25 15:36:02 2002 -@@ -13,7 +13,7 @@ +Index: lockdev-1.0.1/Makefile +=================================================================== +--- lockdev-1.0.1.orig/Makefile ++++ lockdev-1.0.1/Makefile +@@ -12,7 +12,7 @@ VER = $(shell expr `pwd` : '.*-\([0-9.]* MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'} static = ${libname}.a @@ -9,7 +11,7 @@ soname = ${libname}.so.${MVER} # overwritten by caller (e.g.: debian/rules) -@@ -78,6 +78,7 @@ +@@ -77,6 +77,7 @@ install_doc: docs/lockdev.3 install_run: ${shared} install -m755 -d ${libdir} install -m755 ${shared} ${libdir} diff --git a/lockdev-1.0.1-gccwarn.patch b/lockdev-1.0.1-gccwarn.patch new file mode 100644 index 0000000..3f9ce64 --- /dev/null +++ b/lockdev-1.0.1-gccwarn.patch @@ -0,0 +1,21 @@ +diff -up lockdev-1.0.1/src/sample.c.kzak lockdev-1.0.1/src/sample.c +--- lockdev-1.0.1/src/sample.c.kzak 2008-10-06 11:29:48.000000000 +0200 ++++ lockdev-1.0.1/src/sample.c 2008-10-06 11:30:26.000000000 +0200 +@@ -1,4 +1,8 @@ + #include ++#include ++#include ++#include ++ + #include "lockdev.h" + + void +@@ -13,7 +17,7 @@ int debug; + int + main(int argc, char *argv[]) + { +- int i, chld; ++ int i; + char *p = NULL, *dev = NULL, ch; + + ch = '\0'; diff --git a/lockdev.spec b/lockdev.spec index 6a83daa..2b49029 100644 --- a/lockdev.spec +++ b/lockdev.spec @@ -1,7 +1,7 @@ Summary: A library for locking devices Name: lockdev Version: 1.0.1 -Release: 12%{?dist}.1 +Release: 13%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://packages.debian.org/unstable/source/lockdev @@ -16,8 +16,9 @@ Patch5: lockdev-1.0.1-pidexists.patch Patch6: lockdev-1.0.1-subdir.patch Patch7: lockdev-1.0.1-fcntl.patch Patch8: lockdev-1.0.1-32bit.patch +Patch9: lockdev-1.0.1-gccwarn.patch -Requires(pre): shadow-utils +Requires(pre): shadow-utils Requires(post): glibc Requires(postun): glibc PreReq: filesystem >= 2.1.4-1 @@ -51,6 +52,7 @@ package contains the development headers and a static library. %patch6 -p1 -b .subdir %patch7 -p1 -b .fcntl %patch8 -p1 -b .32bit +%patch9 -p1 -b .warn %build make "CFLAGS=${RPM_OPT_FLAGS} -fPIC" @@ -89,6 +91,10 @@ rm -fr $RPM_BUILD_ROOT %{_includedir}/* %changelog +* Mon Oct 6 2008 Karel Zak - 1.0.1-13 +- refresh patches (due --fuzz=0) +- fix compiler warnings + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-12.1 - Autorebuild for GCC 4.3