[devel] lockdev is orphaned

[Dmitriy Khanzhin <dimajin@sandy.ru>]

[-- Attachment #1: Type: text/plain, Size: 852 bytes --]

Hi!
Мне lockdev нужен для сборки gphoto2.
Локальная сборка вываливается с криком
[...]
+ gcc -pipe -Wall -O2 -D_GNU_SOURCE -D_REENTRANT
-I/usr/src/RPM/BUILD/lockdev-1.0.1/src -Werror -fPIC -DPIC src/lockdev.c
-shared -Wl,-soname=liblockdev.so.1 -o liblockdev.so.1
cc1: warnings being treated as errors
src/lockdev.c: In function '_dl_check_lock':
src/lockdev.c:460: warning: ignoring return value of 'fscanf', declared
with attribute warn_unused_result
src/lockdev.c:465: warning: ignoring return value of 'link', declared with
attribute warn_unused_result
error: Bad exit status from /usr/src/tmp/rpm-tmp.7004 (%build)

Я так полагаю, это из-за -Werror.
Я решил его не трогать и наваял на коленке патч. Не шедевр, но с ним
собирается.

2 at@: гляньте, пожалуйста. А то мож NMU или совсем отдадите пакет?

-- 
Rgrds, jinn.




[-- Attachment #2: lockdev-1.0.1-alt-fixbuild-20070204.patch --]
[-- Type: text/plain, Size: 858 bytes --]

--- lockdev-1.0.1/src/lockdev.c.dvh	2007-02-04 07:41:22 +0300
+++ lockdev-1.0.1/src/lockdev.c	2007-02-04 07:54:39 +0300
@@ -388,7 +388,8 @@
 	/* no check on lockname */
 	FILE *fd = 0;
 	int j = 0;
-
+	int varemp; /* empty variable */
+	
 	_debug( 3, "_dl_check_lock(lockname=%s)\n", lockname);
 	if ( _dl_block_semaphore() ) {
 		return -1;
@@ -457,12 +458,12 @@
 		if ( ! (fd=fopen( tpname, "r")) ) {
 			return -1;
 		}
-		fscanf( fd, "%d", &pid2);
+		varemp = fscanf( fd, "%d", &pid2);
 		if ( pid2 && (pid2 != pid_read) && ( _dl_pid_exists( pid2))) {
 			/* lock file was changed! let us quickly
 			 * put it back again
 			 */
-			link( tpname, lockname);
+			varemp = link( tpname, lockname);
 			/* could fail, meaning that there is a fourth
 			 * process involved which now owns the lock, but
 			 * it is possible that the third process, who