Mon Dec 7 09:28:58 UTC 2009

Author: jpopelka

Update of /cvs/pkgs/rpms/lockdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19273

Modified Files:
	.cvsignore lockdev.spec sources 
Added Files:
	lockdev-1.0.3-checkname.patch lockdev-1.0.3-cli.patch 
	lockdev-1.0.3-gccwarn.patch lockdev-1.0.3-man8.patch 
	lockdev-1.0.3-pidexists.patch lockdev-1.0.3-rh.patch 
	lockdev-1.0.3-shared.patch 
Removed Files:
	lockdev-1.0.0-cli.patch lockdev-1.0.0-rh.patch 
	lockdev-1.0.0-shared.patch lockdev-1.0.0-signal.patch 
	lockdev-1.0.1-32bit.patch lockdev-1.0.1-checkname.patch 
	lockdev-1.0.1-fcntl.patch lockdev-1.0.1-gccwarn.patch 
	lockdev-1.0.1-man8.patch lockdev-1.0.1-pidexists.patch 
	lockdev-1.0.1-subdir.patch 
Log Message:
* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-1
- 1.0.3.  No longer need 1.0.0-signal, 1.0.1-subdir, 1.0.1-fcntl, 1.0.1-32bit patches.
- Renumbered patches and sources.


lockdev-1.0.3-checkname.patch:
 lockdev.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE lockdev-1.0.3-checkname.patch ---
diff -up lockdev-1.0.3/src/lockdev.c.checkname lockdev-1.0.3/src/lockdev.c
--- lockdev-1.0.3/src/lockdev.c.checkname	2009-12-05 15:40:16.000000000 +0100
+++ lockdev-1.0.3/src/lockdev.c	2009-12-05 15:55:29.000000000 +0100
@@ -487,18 +487,19 @@ _dl_check_devname (const char *devname)
 		_debug( 3, "_dl_check_devname(%s) stripped name = %s\n", devname, p);
 	} else {
 		/* Otherwise, strip off everything but the device name. */
-		while ( (m=strrchr( p, '/')) != 0 ) {
-			p = m+1;	/* was pointing to the slash */
+		p += strspn(p, " \t\r\n\v\f\a");        /* skip leading whitespace */
+		if (strncmp(p, DEV_PATH, strlen(DEV_PATH)) == 0) {
+			p += strlen(DEV_PATH);	/* 1st char after slash */
 			_debug( 3, "_dl_check_devname(%s) name = %s\n", devname, p);
 		}
 	}
 	if ( strcmp( p, "tty") == 0 )
 		p = ttyname( 0); /* this terminal, if it exists */
-	if ( ((l=strlen( p)) == 0 ) || ( l > (MAXPATHLEN - strlen(LOCK_PATH)) ))
-	 	return 0;
-	if ( ! (m = malloc( 1 + l)) )
-		return 0;
-	return strcpy( m, p);
+	if (((l = strlen(p)) == 0) || (l > (MAXPATHLEN - strlen(LOCK_PATH))))
+	 	return NULL;
+	if ((m = malloc(++l)) == NULL)
+		return NULL;
+	return strcpy(m, p);
 }
 
 

lockdev-1.0.3-cli.patch:
 sample.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE lockdev-1.0.3-cli.patch ---
diff -up lockdev-1.0.3/src/sample.c.cli lockdev-1.0.3/src/sample.c
--- lockdev-1.0.3/src/sample.c.cli	2009-12-05 15:40:16.000000000 +0100
+++ lockdev-1.0.3/src/sample.c	2009-12-05 15:48:39.000000000 +0100
@@ -32,6 +32,8 @@ main (int   argc,
 		}
 		else dev = p;
 	}
+	if (dev == NULL)
+	    usage();
 	i = 0;
 	(void) dev_setpid(getppid());
 	switch( ch ) {

lockdev-1.0.3-gccwarn.patch:
 sample.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE lockdev-1.0.3-gccwarn.patch ---
diff -up lockdev-1.0.3/src/sample.c.gccwarn lockdev-1.0.3/src/sample.c
--- lockdev-1.0.3/src/sample.c.gccwarn	2009-12-05 15:50:04.000000000 +0100
+++ lockdev-1.0.3/src/sample.c	2009-12-05 16:49:40.000000000 +0100
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "lockdev.h"
 
 void
@@ -14,7 +16,7 @@ int
 main (int   argc,
       char *argv[])
 {
-	int i, chld;
+	int i;
 	char *p = NULL, *dev = NULL, ch;
 
 	ch = '\0';

lockdev-1.0.3-man8.patch:
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE lockdev-1.0.3-man8.patch ---
diff -up lockdev-1.0.3/Makefile.man8 lockdev-1.0.3/Makefile
--- lockdev-1.0.3/Makefile.man8	2009-12-05 15:43:47.000000000 +0100
+++ lockdev-1.0.3/Makefile	2009-12-05 16:52:13.000000000 +0100
@@ -75,7 +75,9 @@ install_profile:	${static} ${shared}
 
 install_doc:	docs/lockdev.3
 	install -m755 -d	${mandir}/man3
+	install -m755 -d	${mandir}/man8
 	install -m644 docs/lockdev.3	${mandir}/man3
+	install -m644 docs/lockdev.8	${mandir}/man8
 
 install_run:	${shared}
 	install -m755 -d	${libdir}

lockdev-1.0.3-pidexists.patch:
 lockdev.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE lockdev-1.0.3-pidexists.patch ---
diff -up lockdev-1.0.3/src/lockdev.c.pidexists lockdev-1.0.3/src/lockdev.c
--- lockdev-1.0.3/src/lockdev.c.pidexists	2009-12-05 15:56:46.000000000 +0100
+++ lockdev-1.0.3/src/lockdev.c	2009-12-05 16:05:46.000000000 +0100
@@ -148,7 +148,7 @@ static inline	int	_dl_lock_semaphore	( v
 static inline	int	_dl_block_semaphore	( void);
 static		pid_t	_dl_check_lock	( const char * lockname);
 static		char *	_dl_check_devname	( const char * devname);
-
+static inline	int	_dl_pid_exists		( pid_t pid );
 
 #define	SEMAPHORE	"LOCKDEV"
 #define	close_n_return( v)	return( _dl_unlock_semaphore( v))
@@ -394,7 +394,7 @@ _dl_check_lock(const char *lockname)
 	/* checks content's format */
 	if ( j == 1 ) {
 		/* checks process existence */
-		if ( ( kill( pid_read, 0) == 0 ) || (errno == EPERM) ) {
+		if ( _dl_pid_exists( pid_read) || (errno == EPERM) ) {
 			_debug( 2, "_dl_check_lock() locked by %d\n", (int)pid_read);
 			return pid_read;
 		}
@@ -443,7 +443,7 @@ _dl_check_lock(const char *lockname)
 			return -1;
 		}
 		fscanf( fd, "%d", &pid2);
-		if ( pid2 && (pid2 != pid_read) && ( kill( pid2, 0) == 0 )) {
+		if ( pid2 && (pid2 != pid_read) && _dl_pid_exists(pid2) ) {
 			/* lock file was changed! let us quickly
 			 * put it back again
 			 */
@@ -502,6 +502,17 @@ _dl_check_devname (const char *devname)
 	return strcpy(m, p);
 }
 
+/* for internal use */
+/* correctly check if a process with a given pid exists */
+static inline int
+_dl_pid_exists(pid_t pid)
+{
+	if ( !kill( pid, 0))
+		return 1;
+	if ( errno == ESRCH)
+		return 0;
+	return 1;
+}
 
 /* exported by the interface file lockdev.h */
 /* ZERO means that the device wasn't locked, but could have been locked later */

lockdev-1.0.3-rh.patch:
 Makefile      |   19 ++++++--
 src/baudboy.h |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lockdev.c |   48 +++++++++++++++-----
 src/lockdev.h |    4 +
 src/sample.c  |   64 +++++++++++++++++----------
 5 files changed, 234 insertions(+), 38 deletions(-)

--- NEW FILE lockdev-1.0.3-rh.patch ---
diff -up lockdev-1.0.3/Makefile.redhat lockdev-1.0.3/Makefile
--- lockdev-1.0.3/Makefile.redhat	2005-10-03 20:51:53.000000000 +0200
+++ lockdev-1.0.3/Makefile	2009-12-05 17:42:41.000000000 +0100
@@ -6,6 +6,7 @@ pkgname = lockdev
 objs	= src/lockdev.o
 shobjs	= src/lockdev.z
 
+lockdev	= src/sample.c
 
 VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
 MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
@@ -18,17 +19,18 @@ soname	= ${libname}.so.${MVER}
 basedir	= /usr/local
 srcdir=.
 
+sbindir	= ${basedir}/sbin
 libdir	= ${basedir}/lib
 incdir	= ${basedir}/include
 mandir	= ${basedir}/share/man
 
 CC	= gcc
-LCFLAGS	= -g -O2 -fPIC -Wall -pipe -D_REENTRANT 
-CFLAGS	= -g
+CFLAGS	= -g -O2 -Wall -pipe
+LCFLAGS	= ${CFLAGS} -fPIC -D_REENTRANT
 LDLIBS	= -llockdev
 
 .PHONY: shared static perl-lib
-ALL:	shared static perl-lib
+ALL:	shared static lockdev perl-lib
 
 static ${static}:       ${objs}
 	$(AR) $(ARFLAGS) ${static} $^
@@ -36,6 +38,12 @@ static ${static}:       ${objs}
 shared ${shared}:	${shobjs}
 	${CC} ${LCFLAGS} -shared -Wl,-soname,${soname} $^ -lc -o ${shared}
 
+lockdev.o: ${lockdev}
+	${CC} ${CFLAGS} -I./src -o $@ -c $^
+
+lockdev: lockdev.o ${static}
+	${CC} -o $@ $^
+
 src/lockdev.z: src/lockdev.c
 	${CC} ${CFLAGS} -c -fPIC -o $@ $?
 
@@ -54,6 +62,7 @@ install_dev:	${static} src/lockdev.h
 	install -m755 -d	${incdir}
 	install -m644 src/lockdev.h	${incdir}
 	install -m644 src/ttylock.h	${incdir}
+	install -m644 src/baudboy.h	${incdir}
 
 install_debug:	${static} ${shared}
 	install -m755 -d	${libdir}/debug
@@ -71,7 +80,9 @@ install_doc:	docs/lockdev.3
 
 install_run:	${shared}
 	install -m755 -d	${libdir}
-	install -m644 ${shared}	${libdir}
+	install -m755 ${shared}	${libdir}
+	install -m755 -d	${sbindir}
+	install -m755 lockdev	${sbindir}
 
 .PHONY: clean distclean perl-clean mostyclean 
 perl-clean:	clean
diff -up /dev/null lockdev-1.0.3/src/baudboy.h
--- /dev/null	2009-12-05 11:05:54.692858210 +0100
+++ lockdev-1.0.3/src/baudboy.h	2009-12-05 17:38:03.000000000 +0100
@@ -0,0 +1,137 @@
+/* Copyright (C) 2001 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   It 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 Lesser General
+   Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this software; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+
+#ifndef _BAUDBOY_H_
+#define _BAUDBOY_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	LOCKDEV_PATH	"/usr/sbin/lockdev"
+
+static inline int _doit(const char * argv[])
+{
+    pid_t child;
+    int status;
+    void (*osig) (int) = signal(SIGCHLD, SIG_DFL);
+    int rc;
+
+    if (!(child = fork())) {
+	int fd;
+        /* these have to be open to something */
+	if ((fd = open("/dev/null", 2)) < 0)
+	    exit(-1);
+	dup2(fd, 0);
+	dup2(fd, 1);
+	dup2(fd, 2);
+	close(fd);
+	/* Swap egid and gid for lockdev's access(2) device check. */
+	setregid(getegid(), getgid());
+	execv(argv[0], (char *const *)argv);
+	exit(-1);
+    }
+
+    rc = (int) waitpid(child, &status, 0);
+    signal(SIGCHLD, osig);
+    if (rc == child && WIFEXITED(status)) {
+	/*
+	 * Exit		dev_lock	dev_unlock	dev_testlock
+	 *	  0	OK		OK		not locked
+	 *	  1	locked other	locked other	locked
+	 *	  2	EACCES
+	 *	  3	EROFS
+	 *	  4	EFAULT
+	 *	  5	EINVAL
+	 *	  6	ENAMETOOLONG
+	 *	  7	ENOENT
+	 *	  8	ENOTDIR
+	 *	  9	ENOMEM
+	 *	 10	ELOOP
+	 *	 11	EIO
+	 *	255	error		error		error
+	 */
+	rc = WEXITSTATUS(status);
+	switch(rc) {
+	case  0:	rc = 0;		break;
+	default:
+	case  1:	rc = -EPERM;	break;
+	case  2:	rc = -EACCES;	break;
+	case  3:	rc = -EROFS;	break;
+	case  4:	rc = -EFAULT;	break;
+	case  5:	rc = -EINVAL;	break;
+	case  6:	rc = -ENAMETOOLONG;	break;
+	case  7:	rc = -ENOENT;	break;
+	case  8:	rc = -ENOTDIR;	break;
+	case  9:	rc = -ENOMEM;	break;
+	case 10:	rc = -ELOOP;	break;
+	case 11:	rc = -EIO;	break;
+	}
+    } else if (rc == -1)
+	rc = -errno;
+    else
+	rc = -ECHILD;
+
+    return rc;
+
+}
+
+static inline int ttylock(const char * devname)
+{
+    const char * argv[] = { LOCKDEV_PATH, "-l", NULL, NULL};
+    argv[2] = devname;
+    return _doit(argv);
+}
+
+static inline int ttyunlock(const char * devname)
+{
+    const char * argv[] = { LOCKDEV_PATH, "-u", NULL, NULL};
+    argv[2] = devname;
+    return _doit(argv);
+}
+
+static inline int ttylocked(const char * devname)
+{
+    const char * argv[] = { LOCKDEV_PATH, NULL, NULL};
+    argv[1] = devname;
+    return _doit(argv);
+}
+
+static inline int ttywait(const char * devname)
+{
+    int rc;
+    while((rc = ttylocked(devname)) == 0)
+	sleep(1);
+    return rc;
+}
+
+#ifdef	__cplusplus
+};
+#endif
+
+#endif /* _BAUDBOY_H_ */
diff -up lockdev-1.0.3/src/lockdev.c.redhat lockdev-1.0.3/src/lockdev.c
--- lockdev-1.0.3/src/lockdev.c.redhat	2006-04-20 21:11:08.000000000 +0200
+++ lockdev-1.0.3/src/lockdev.c	2009-12-05 17:38:03.000000000 +0100
@@ -177,6 +177,19 @@ liblockdev_reset_debug (void)
 	liblockdev_debug = 0;
 }
 
+static pid_t dev_pid = 0;
+
+pid_t dev_getpid(void)
+{
+    return (dev_pid ? dev_pid : getpid());
+}
+
+pid_t dev_setpid(pid_t newpid)
+{
+    pid_t oldpid = dev_pid;
+    dev_pid = newpid;
+    return oldpid;
+}
 
 /*
  * for internal use *
@@ -423,7 +436,7 @@ _dl_check_lock(const char *lockname)
 		 * maybe also this sprintf should be added to the
 		 * conditional part, as the others
 		 */
-		sprintf( tpname, "%s/.%d", LOCK_PATH, (int)getpid());
+		sprintf( tpname, "%s/.%d", LOCK_PATH, (int)dev_getpid());
 		unlink( tpname);	/* in case there was */
 		rename( lockname, tpname);
 		if ( ! (fd=fopen( tpname, "r")) ) {
@@ -511,7 +524,7 @@ dev_testlock(const char *devname)
 #endif /* DEBUG */
 	_debug( 3, "dev_testlock(%s)\n", devname);
 	if ( ! (p=_dl_check_devname( devname)) )
-	 	close_n_return( -1);
+	 	close_n_return( -errno);
 	strcpy( device, DEV_PATH);
 	strcat( device, p);	/* now device has a copy of the pathname */
 	_debug( 2, "dev_testlock() device = %s\n", device);
@@ -585,7 +598,7 @@ dev_lock (const char *devname)
 #endif /* DEBUG */
 	_debug( 3, "dev_lock(%s)\n", devname);
 	if (oldmask == -1 )
-		oldmask = umask( 0);	/* give full permissions to files created */
+		oldmask = umask( 002);	/* apply o-w to files created */
 	if ( ! (p=_dl_check_devname( devname)) )
 	 	close_n_return( -1);
 	strcpy( device, DEV_PATH);
@@ -596,11 +609,14 @@ dev_lock (const char *devname)
 	 * and minor numbers
 	 */
 	if ( stat( device, &statbuf) == -1 ) {
-		close_n_return( -1);
+		close_n_return(-errno);
+	}
+	if ( access( device, W_OK ) == -1 ) {
+		close_n_return(-errno);
 	}
 
 	/* now get our own pid */
-	our_pid = getpid();
+	our_pid = dev_getpid();
 	_debug( 2, "dev_lock() our own pid = %d\n", (int)our_pid);
 
 	/* We will use this algorithm:
@@ -641,8 +657,9 @@ dev_lock (const char *devname)
 	_dl_filename_1( lock1, &statbuf);
 	while ( ! (pid=_dl_check_lock( lock1)) ) {
 		if (( link( lock0, lock1) == -1 ) && ( errno != EEXIST )) {
+			int rc = -errno;
 			unlink( lock0);
-			close_n_return( -1);
+			close_n_return(rc);
 		}
 	}
 	if ( pid != our_pid ) {
@@ -659,9 +676,10 @@ dev_lock (const char *devname)
 	/* lockfile of type /var/lock/LCK..ttyS2 */
 	while ( ! (pid=_dl_check_lock( lock2)) ) {
 		if (( link( lock0, lock2) == -1 ) && ( errno != EEXIST )) {
+			int rc = -errno;
 			unlink( lock0);
 			unlink( lock1);
-			close_n_return( -1);
+			close_n_return(rc);
 		}
 	}
 	if ( pid != our_pid ) {
@@ -740,7 +758,7 @@ dev_relock (const char  *devname,
 #endif /* DEBUG */
 	_debug( 3, "dev_relock(%s, %d)\n", devname, (int)old_pid);
 	if (oldmask == -1 )
-		oldmask = umask( 0);	/* give full permissions to files created */
+		oldmask = umask( 002);	/* apply o-w to files created */
 	if ( ! (p=_dl_check_devname( devname)) )
 	 	close_n_return( -1);
 	strcpy( device, DEV_PATH);
@@ -751,11 +769,14 @@ dev_relock (const char  *devname,
 	 * and minor numbers
 	 */
 	if ( stat( device, &statbuf) == -1 ) {
-		close_n_return( -1);
+		close_n_return(-errno);
+	}
+	if ( access( device, W_OK ) == -1 ) {
+		close_n_return(-errno);
 	}
 
 	/* now get our own pid */
-	our_pid = getpid();
+	our_pid = dev_getpid();
 	_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
@@ -825,7 +846,7 @@ dev_unlock (const char *devname,
 #endif /* DEBUG */
 	_debug( 3, "dev_unlock(%s, %d)\n", devname, (int)pid);
 	if (oldmask == -1 )
-		oldmask = umask( 0);	/* give full permissions to files created */
+		oldmask = umask( 002);	/* apply o-w to files created */
 	if ( ! (p=_dl_check_devname( devname)) )
 	 	close_n_return( -1);
 	strcpy( device, DEV_PATH);
@@ -836,7 +857,10 @@ dev_unlock (const char *devname,
 	 * and minor numbers
 	 */
 	if ( stat( device, &statbuf) == -1 ) {
-		close_n_return( -1);
+		close_n_return(-errno);
+	}
+	if ( access( device, W_OK ) == -1 ) {
+		close_n_return(-errno);
 	}
 
 	/* first remove the FSSTND-1.2 lock, get the pid of the
diff -up lockdev-1.0.3/src/lockdev.h.redhat lockdev-1.0.3/src/lockdev.h
--- lockdev-1.0.3/src/lockdev.h.redhat	2005-10-03 19:44:33.000000000 +0200
+++ lockdev-1.0.3/src/lockdev.h	2009-12-05 17:38:03.000000000 +0100
@@ -43,12 +43,16 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
+#include <errno.h>
 
 /* API of the library */
 
 void liblockdev_incr_debug (void);
 void liblockdev_reset_debug (void);
 
+pid_t dev_getpid (void);
+pid_t dev_setpid (pid_t pid);
+
 pid_t dev_testlock (const char *devname);
 
 pid_t dev_lock (const char *devname);
diff -up lockdev-1.0.3/src/sample.c.redhat lockdev-1.0.3/src/sample.c
--- lockdev-1.0.3/src/sample.c.redhat	2005-10-03 19:51:17.000000000 +0200
+++ lockdev-1.0.3/src/sample.c	2009-12-05 17:38:03.000000000 +0100
@@ -5,8 +5,8 @@
 void
 usage (void)
 {
-	fprintf( stderr, "Usage: sample [-lurd] <device>\n" );
-	exit( -1 );
+	fprintf(stderr, "Usage: %s [-lud] <device>\n", "lockdev");
+	exit(-1);
 }
 
 
@@ -15,7 +15,7 @@ main (int   argc,
       char *argv[])
 {
 	int i, chld;
-	char *p, *dev, ch;
+	char *p = NULL, *dev = NULL, ch;
 
 	ch = '\0';
 	for( i = argc - 1; i > 0; i-- ) {
@@ -23,8 +23,7 @@ main (int   argc,
 		if( *p == '-' ) {
 			switch( *++p ) {
 			case 'l': 
-			case 'u': 
-			case 'r': ch = *p; break;
+			case 'u': ch = *p; break;
 			case 'd':
 				liblockdev_incr_debug();
 				break;
@@ -33,31 +32,52 @@ main (int   argc,
 		}
 		else dev = p;
 	}
-	fprintf( stderr, "option %c, device %s\n", ch, dev );
 	i = 0;
+	(void) dev_setpid(getppid());
 	switch( ch ) {
 	case 'l':
 		i = dev_lock( dev);
 		break;
 	case 'u':
-		i = dev_unlock( dev, 0);
-		break;
-	case 'r':
-		dev_lock( dev);
-		if(( chld = fork()) == 0 ) {
-			sleep(5);
-		}
-		else {
-			sleep( 1);
-			if (( i = dev_relock( dev, chld)) < 0 ) {
-				fprintf( stderr, "Relock failed in parent.\n" );
-			}
-		}
+		i = dev_unlock(dev, 0);
 		break;
 	default:
-		i = dev_testlock( dev);
+		if (dev)
+			i = dev_testlock(dev);
 		break;
 	}
-	exit( i);
-}
 
+	/*
+	 * Exit		dev_lock	dev_unlock	dev_testlock
+	 *	  0	OK		OK		not locked
+	 *	  1	locked other	locked other	locked
+	 *	  2	EACCES
+	 *	  3	EROFS
+	 *	  4	EFAULT
+	 *	  5	EINVAL
+	 *	  6	ENAMETOOLONG
+	 *	  7	ENOENT
+	 *	  8	ENOTDIR
+	 *	  9	ENOMEM
+	 *	 10	ELOOP
+	 *	 11	EIO
+	 *	255	error		error		error
+	 */
+	switch (i) {
+	case -EACCES:	i = 2;	break;
+	case -EROFS:	i = 3;	break;
+	case -EFAULT:	i = 4;	break;
+	case -EINVAL:	i = 5;	break;
+	case -ENAMETOOLONG:	i = 6;	break;
+	case -ENOENT:	i = 7;	break;
+	case -ENOTDIR:	i = 8;	break;
+	case -ENOMEM:	i = 9;	break;
+	case -ELOOP:	i = 10;	break;
+	case -EIO:	i = 11;	break;
+	default:
+	    if (i < 0) i = 255;
+	    else if (i > 0) 	i = 1;
+	    break;
+	}
+	exit(i);
+}

lockdev-1.0.3-shared.patch:
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE lockdev-1.0.3-shared.patch ---
diff -up lockdev-1.0.3/Makefile.shared lockdev-1.0.3/Makefile
--- lockdev-1.0.3/Makefile.shared	2009-12-05 15:40:16.000000000 +0100
+++ lockdev-1.0.3/Makefile	2009-12-05 15:41:58.000000000 +0100
@@ -12,7 +12,7 @@ VER	= $(shell expr `pwd` : '.*-\([0-9.]*
 MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
 
 static	= ${libname}.a
-shared	= ${libname}.${VER}.so
+shared	= ${libname}.so.${VER}
 soname	= ${libname}.so.${MVER}
 
 # overwritten by caller (e.g.: debian/rules)
@@ -80,6 +80,7 @@ install_doc:	docs/lockdev.3
 install_run:	${shared}
 	install -m755 -d	${libdir}
 	install -m755 ${shared}	${libdir}
+	ln -s ${shared}		${libdir}/liblockdev.so
 	install -m755 -d	${sbindir}
 	install -m755 lockdev	${sbindir}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 08:00:28 -0000	1.3
+++ .cvsignore	7 Dec 2009 09:28:58 -0000	1.4
@@ -1 +1 @@
-lockdev_1.0.1.orig.tar.gz
+lockdev_1.0.3.orig.tar.gz


Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- lockdev.spec	3 Dec 2009 07:44:55 -0000	1.36
+++ lockdev.spec	7 Dec 2009 09:28:58 -0000	1.37
@@ -1,24 +1,20 @@
 Summary: A library for locking devices
 Name: lockdev
-Version: 1.0.1
-Release: 20%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
 Source0: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
 Source1: lockdev.8
 
-Patch0: lockdev-1.0.0-rh.patch
-Patch1: lockdev-1.0.0-shared.patch
-Patch2: lockdev-1.0.0-signal.patch
-Patch3: lockdev-1.0.0-cli.patch
-Patch4: lockdev-1.0.1-checkname.patch
-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
-Patch10: lockdev-1.0.1-man8.patch
+Patch0: lockdev-1.0.3-rh.patch
+Patch1: lockdev-1.0.3-shared.patch
+Patch2: lockdev-1.0.3-cli.patch
+Patch3: lockdev-1.0.3-checkname.patch
+Patch4: lockdev-1.0.3-pidexists.patch
+Patch5: lockdev-1.0.3-gccwarn.patch
+Patch6: lockdev-1.0.3-man8.patch
 
 Requires(pre): shadow-utils
 Requires(post): glibc
@@ -46,15 +42,11 @@ package contains the development headers
 %setup -q
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .shared
-%patch2 -p1 -b .signal
-%patch3 -p1 -b .jbj
-%patch4 -p1 -b .checkname
-%patch5 -p1 -b .pidexists
-%patch6 -p1 -b .subdir
-%patch7 -p1 -b .fcntl
-%patch8 -p1 -b .32bit
-%patch9 -p1 -b .warn
-%patch10 -p1 -b .man8
+%patch2 -p1 -b .cli
+%patch3 -p1 -b .checkname
+%patch4 -p1 -b .pidexists
+%patch5 -p1 -b .warn
+%patch6 -p1 -b .man8
 
 cp %SOURCE1 ./docs
 
@@ -98,6 +90,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.3-1
+- 1.0.3.  No longer need 1.0.0-signal, 1.0.1-subdir, 1.0.1-fcntl, 1.0.1-32bit patches.
+- Renumbered patches and sources.
+
 * Thu Dec 03 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-20
 - Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
 - Added back Buildroot to silence rpmlint's false positive


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Sep 2004 08:00:28 -0000	1.3
+++ sources	7 Dec 2009 09:28:58 -0000	1.4
@@ -1 +1 @@
-3deda988583172b673f984b0d1cdeb0d  lockdev_1.0.1.orig.tar.gz
+64b9c1b87b125fc348e892e24625524a  lockdev_1.0.3.orig.tar.gz


--- lockdev-1.0.0-cli.patch DELETED ---


--- lockdev-1.0.0-rh.patch DELETED ---


--- lockdev-1.0.0-shared.patch DELETED ---


--- lockdev-1.0.0-signal.patch DELETED ---


--- lockdev-1.0.1-32bit.patch DELETED ---


--- lockdev-1.0.1-checkname.patch DELETED ---


--- lockdev-1.0.1-fcntl.patch DELETED ---


--- lockdev-1.0.1-gccwarn.patch DELETED ---


--- lockdev-1.0.1-man8.patch DELETED ---


--- lockdev-1.0.1-pidexists.patch DELETED ---


--- lockdev-1.0.1-subdir.patch DELETED ---


