[arch-commits] Commit in lockdev/repos/community-x86_64 (6 files)

Jelle van der Waa jelle at archlinux.org
Thu May 7 13:26:56 UTC 2020


    Date: Thursday, May 7, 2020 @ 13:26:56
  Author: jelle
Revision: 625349

archrelease: copy trunk to community-x86_64

Added:
  lockdev/repos/community-x86_64/PKGBUILD
    (from rev 625348, lockdev/trunk/PKGBUILD)
  lockdev/repos/community-x86_64/build.patch
    (from rev 625348, lockdev/trunk/build.patch)
  lockdev/repos/community-x86_64/gcc-4.7.patch
    (from rev 625348, lockdev/trunk/gcc-4.7.patch)
Deleted:
  lockdev/repos/community-x86_64/PKGBUILD
  lockdev/repos/community-x86_64/build.patch
  lockdev/repos/community-x86_64/gcc-4.7.patch

---------------+
 PKGBUILD      |   87 +++++++++++++++++++++++++++-----------------------------
 build.patch   |   60 +++++++++++++++++++-------------------
 gcc-4.7.patch |   36 +++++++++++------------
 3 files changed, 91 insertions(+), 92 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-07 13:26:45 UTC (rev 625348)
+++ PKGBUILD	2020-05-07 13:26:56 UTC (rev 625349)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Andreas Wagner <a.wagner at stud.uni-frankfurt.de>
-
-pkgname=lockdev
-pkgver=1.0.3_1.6
-_pkgver=1.0.3
-pkgrel=5
-pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
-url='http://packages.qa.debian.org/l/lockdev.html'
-license=("GPL")
-arch=('x86_64')
-depends=('glibc' 'systemd')
-source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
-	"http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
-	'build.patch'
-	'gcc-4.7.patch')
-md5sums=('64b9c1b87b125fc348e892e24625524a'
-         '5ef6267c42fca9145e0af006ccb6aff7'
-         '2db93cadf6670ddcd01de4bfc22a35e1'
-         'e16faebfa2d162d40830ef6f2700b7ba')
-
-prepare() {
-  cd "${pkgname}-${_pkgver}"
-  patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
-  sed -i "s|CFLAGS	= -g|CFLAGS	= -g -fPIC|" Makefile
-  patch -p1 -i ../build.patch # FS#33280
-  patch -p1 -i ../gcc-4.7.patch # FS#34457
-}
-
-build() {
-  cd "${pkgname}-${_pkgver}"
-  make CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
-}
-
-package() {
-  cd "${pkgname}-${_pkgver}"
-  make basedir="${pkgdir}/usr" install
-
-  # Setup lock directory
-  install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
-  echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-}

Copied: lockdev/repos/community-x86_64/PKGBUILD (from rev 625348, lockdev/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-07 13:26:56 UTC (rev 625349)
@@ -0,0 +1,43 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Andreas Wagner <a.wagner at stud.uni-frankfurt.de>
+
+pkgname=lockdev
+pkgver=1.0.3_1.6
+_pkgver=1.0.3
+pkgrel=6
+pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
+url='https://packages.qa.debian.org/l/lockdev.html'
+license=("GPL")
+arch=('x86_64')
+depends=('glibc' 'systemd')
+source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
+	"http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
+	'build.patch'
+	'gcc-4.7.patch')
+md5sums=('64b9c1b87b125fc348e892e24625524a'
+         '5ef6267c42fca9145e0af006ccb6aff7'
+         '2db93cadf6670ddcd01de4bfc22a35e1'
+         'e16faebfa2d162d40830ef6f2700b7ba')
+
+prepare() {
+  cd "${pkgname}-${_pkgver}"
+  patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
+  sed -i "s|CFLAGS	= -g|CFLAGS	= -g -fPIC|" Makefile
+  patch -p1 -i ../build.patch # FS#33280
+  patch -p1 -i ../gcc-4.7.patch # FS#34457
+}
+
+build() {
+  cd "${pkgname}-${_pkgver}"
+  make CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
+}
+
+package() {
+  cd "${pkgname}-${_pkgver}"
+  make basedir="${pkgdir}/usr" install
+
+  # Setup lock directory
+  install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
+  echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}

Deleted: build.patch
===================================================================
--- build.patch	2020-05-07 13:26:45 UTC (rev 625348)
+++ build.patch	2020-05-07 13:26:56 UTC (rev 625349)
@@ -1,30 +0,0 @@
-commit 0dd47123655c52d68185f06b9da8fb0e1b925400
-Author: Ludwig Nussel <ludwig.nussel at suse.de>
-Date:   Tue Feb 9 14:56:23 2010 +0100
-
-    RedHat patch 2
-    
-    - change library file name
-    - install devel symlink
-
-diff --git a/Makefile b/Makefile
-index b7b4d1f..3b351dd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,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)
-@@ -76,6 +76,7 @@ install_doc:	docs/lockdev.3
- install_run:	${shared}
- 	install -m755 -d	${libdir}
- 	install -m644 ${shared}	${libdir}
-+	ln -s ${shared}		${libdir}/liblockdev.so
- 
- .PHONY: clean distclean perl-clean mostyclean 
- perl-clean:	clean

Copied: lockdev/repos/community-x86_64/build.patch (from rev 625348, lockdev/trunk/build.patch)
===================================================================
--- build.patch	                        (rev 0)
+++ build.patch	2020-05-07 13:26:56 UTC (rev 625349)
@@ -0,0 +1,30 @@
+commit 0dd47123655c52d68185f06b9da8fb0e1b925400
+Author: Ludwig Nussel <ludwig.nussel at suse.de>
+Date:   Tue Feb 9 14:56:23 2010 +0100
+
+    RedHat patch 2
+    
+    - change library file name
+    - install devel symlink
+
+diff --git a/Makefile b/Makefile
+index b7b4d1f..3b351dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,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)
+@@ -76,6 +76,7 @@ install_doc:	docs/lockdev.3
+ install_run:	${shared}
+ 	install -m755 -d	${libdir}
+ 	install -m644 ${shared}	${libdir}
++	ln -s ${shared}		${libdir}/liblockdev.so
+ 
+ .PHONY: clean distclean perl-clean mostyclean 
+ perl-clean:	clean

Deleted: gcc-4.7.patch
===================================================================
--- gcc-4.7.patch	2020-05-07 13:26:45 UTC (rev 625348)
+++ gcc-4.7.patch	2020-05-07 13:26:56 UTC (rev 625349)
@@ -1,18 +0,0 @@
-diff -Naur lockdev-1.0.3.orig/src/ttylock.h lockdev-1.0.3/src/ttylock.h
---- lockdev-1.0.3.orig/src/ttylock.h	2013-12-13 15:34:52.195877321 +0000
-+++ lockdev-1.0.3/src/ttylock.h	2013-12-13 15:38:16.131190480 +0000
-@@ -36,10 +36,10 @@
- 
- /* API of the library */
- 
--int ttylock (char * devname);
--int ttywait (char * devname);
--int ttyunlock (char * devname);
--int ttylocked (char * devname);
-+static inline int ttylock (char * devname);
-+static inline int ttywait (char * devname);
-+static inline int ttyunlock (char * devname);
-+static inline int ttylocked (char * devname);
- 
- 
- static inline int

Copied: lockdev/repos/community-x86_64/gcc-4.7.patch (from rev 625348, lockdev/trunk/gcc-4.7.patch)
===================================================================
--- gcc-4.7.patch	                        (rev 0)
+++ gcc-4.7.patch	2020-05-07 13:26:56 UTC (rev 625349)
@@ -0,0 +1,18 @@
+diff -Naur lockdev-1.0.3.orig/src/ttylock.h lockdev-1.0.3/src/ttylock.h
+--- lockdev-1.0.3.orig/src/ttylock.h	2013-12-13 15:34:52.195877321 +0000
++++ lockdev-1.0.3/src/ttylock.h	2013-12-13 15:38:16.131190480 +0000
+@@ -36,10 +36,10 @@
+ 
+ /* API of the library */
+ 
+-int ttylock (char * devname);
+-int ttywait (char * devname);
+-int ttyunlock (char * devname);
+-int ttylocked (char * devname);
++static inline int ttylock (char * devname);
++static inline int ttywait (char * devname);
++static inline int ttyunlock (char * devname);
++static inline int ttylocked (char * devname);
+ 
+ 
+ static inline int


More information about the arch-commits mailing list