[arch-commits] Commit in bsdiff/repos/community-x86_64 (4 files)

[Kyle Keen]

    Date: Wednesday, March 25, 2020 @ 20:17:52
  Author: kkeen
Revision: 604379

archrelease: copy trunk to community-x86_64

Added:
  bsdiff/repos/community-x86_64/Makefile.patch
    (from rev 604378, bsdiff/trunk/Makefile.patch)
  bsdiff/repos/community-x86_64/PKGBUILD
    (from rev 604378, bsdiff/trunk/PKGBUILD)
Deleted:
  bsdiff/repos/community-x86_64/Makefile.patch
  bsdiff/repos/community-x86_64/PKGBUILD

----------------+
 Makefile.patch |   50 ++++++++++++++++++++---------------------
 PKGBUILD       |   67 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 60 insertions(+), 57 deletions(-)

Deleted: Makefile.patch
===================================================================
--- Makefile.patch	2020-03-25 20:17:39 UTC (rev 604378)
+++ Makefile.patch	2020-03-25 20:17:52 UTC (rev 604379)
@@ -1,25 +0,0 @@
---- Makefile.old	2005-08-17 00:14:10.000000000 +0200
-+++ Makefile	2007-09-15 12:32:07.000000000 +0200
-@@ -1,15 +1,16 @@
- CFLAGS		+=	-O3 -lbz2
- 
- PREFIX		?=	/usr/local
--INSTALL_PROGRAM	?=	${INSTALL} -c -s -m 555
--INSTALL_MAN	?=	${INSTALL} -c -m 444
-+INSTALL		=	/bin/install
-+INSTALL_PROGRAM	?=	${INSTALL} -D -m755
-+INSTALL_MAN	?=	${INSTALL} -D -m644
- 
- all:		bsdiff bspatch
- bsdiff:		bsdiff.c
- bspatch:	bspatch.c
- 
- install:
--	${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin
--.ifndef WITHOUT_MAN
--	${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1
--.endif
-+	${INSTALL_PROGRAM} bsdiff ${PREFIX}/bin/bsdiff
-+	${INSTALL_PROGRAM} bspatch ${PREFIX}/bin/bspatch
-+	${INSTALL_MAN} bsdiff.1 ${PREFIX}/share/man/man1/bsdiff.1
-+	${INSTALL_MAN} bspatch.1 ${PREFIX}/share/man/man1/bspatch.1

Copied: bsdiff/repos/community-x86_64/Makefile.patch (from rev 604378, bsdiff/trunk/Makefile.patch)
===================================================================
--- Makefile.patch	                        (rev 0)
+++ Makefile.patch	2020-03-25 20:17:52 UTC (rev 604379)
@@ -0,0 +1,25 @@
+--- Makefile.old	2005-08-17 00:14:10.000000000 +0200
++++ Makefile	2007-09-15 12:32:07.000000000 +0200
+@@ -1,15 +1,16 @@
+ CFLAGS		+=	-O3 -lbz2
+ 
+ PREFIX		?=	/usr/local
+-INSTALL_PROGRAM	?=	${INSTALL} -c -s -m 555
+-INSTALL_MAN	?=	${INSTALL} -c -m 444
++INSTALL		=	/bin/install
++INSTALL_PROGRAM	?=	${INSTALL} -D -m755
++INSTALL_MAN	?=	${INSTALL} -D -m644
+ 
+ all:		bsdiff bspatch
+ bsdiff:		bsdiff.c
+ bspatch:	bspatch.c
+ 
+ install:
+-	${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin
+-.ifndef WITHOUT_MAN
+-	${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1
+-.endif
++	${INSTALL_PROGRAM} bsdiff ${PREFIX}/bin/bsdiff
++	${INSTALL_PROGRAM} bspatch ${PREFIX}/bin/bspatch
++	${INSTALL_MAN} bsdiff.1 ${PREFIX}/share/man/man1/bsdiff.1
++	${INSTALL_MAN} bspatch.1 ${PREFIX}/share/man/man1/bspatch.1

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-25 20:17:39 UTC (rev 604378)
+++ PKGBUILD	2020-03-25 20:17:52 UTC (rev 604379)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=bsdiff
-pkgver=4.3
-pkgrel=9
-pkgdesc="bsdiff and bspatch are tools for building and applying patches to binary files."
-url="http://www.daemonology.net/bsdiff/"
-license=('BSD')
-arch=('x86_64')
-depends=('bzip2')
-source=("http://www.daemonology.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	Makefile.patch)
-md5sums=('e6d812394f0e0ecc8d5df255aa1db22a'
-         'f176d14d39c5784a2c824f6797544f4b')
-
-prepare() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  patch -p0 < ../Makefile.patch
-}
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir/usr" install
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  head -n 26 bsdiff.c >"$pkgdir/usr/share/licenses/$pkgname/license"
-}

Copied: bsdiff/repos/community-x86_64/PKGBUILD (from rev 604378, bsdiff/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-25 20:17:52 UTC (rev 604379)
@@ -0,0 +1,35 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=bsdiff
+pkgver=4.3
+pkgrel=10
+pkgdesc="bsdiff and bspatch are tools for building and applying patches to binary files."
+url="https://www.daemonology.net/bsdiff/"
+license=('BSD')
+arch=('x86_64')
+depends=('bzip2')
+source=("https://www.daemonology.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	Makefile.patch
+        "https://security.freebsd.org/patches/SA-16:25/bspatch.patch")
+md5sums=('e6d812394f0e0ecc8d5df255aa1db22a'
+         'f176d14d39c5784a2c824f6797544f4b'
+         '30e8ec771baea61bd9c25adb385b06fc')
+
+prepare() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  patch -p0 < ../Makefile.patch
+  sed -i 's|usr.bin/bsdiff/bspatch/||' ../bspatch.patch
+  patch -p0 < ../bspatch.patch
+}
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make PREFIX="$pkgdir/usr" install
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  head -n 26 bsdiff.c >"$pkgdir/usr/share/licenses/$pkgname/license"
+}