uppkg

3 files changed, 12 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b1f1dccfac3..5a58264efff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ypbind-mt
 	pkgdesc = Linux NIS daemon
-	pkgver = 2.4
-	pkgrel = 3
+	pkgver = 2.5
+	pkgrel = 1
 	url = https://github.com/thkukuk/ypbind-mt
 	arch = i686
 	arch = x86_64
@@ -13,14 +13,12 @@ pkgbase = ypbind-mt
 	depends = yp-tools
 	depends = libsystemd
 	backup = etc/yp.conf
-	source = https://github.com/thkukuk/ypbind-mt/archive/ypbind-mt-2.4.tar.gz
+	source = https://github.com/thkukuk/ypbind-mt/releases/download/v2.5/ypbind-mt-2.5.tar.xz
 	source = ypbind.service
 	source = ypbind.conf
-	source = fixes.patch
-	md5sums = 11f09789cc8bb4d844798c3535c30208
+	md5sums = 86a724d30dd8d65f53a4de28b7344ca1
 	md5sums = 50e05f057ec0603243e3d334aaa0934f
 	md5sums = 3d6a8eb44771f81abb47d14d9e4f301d
-	md5sums = 17374b15cfa85bae36ee1948600821e6
 
 pkgname = ypbind-mt
 
diff --git a/PKGBUILD b/PKGBUILD
index 77b230362532..977c98cc3a04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypbind-mt
-pkgver=2.4
-pkgrel=3
+pkgver=2.5
+pkgrel=1
 pkgdesc='Linux NIS daemon'
 url='https://github.com/thkukuk/ypbind-mt'
 license=('GPL2')
@@ -15,32 +15,24 @@ arch=('i686' 'x86_64')
 makedepends=('libxslt' 'libxml2' 'docbook-xml' 'docbook-xsl')
 depends=('yp-tools' 'libsystemd')
 backup=('etc/yp.conf')
-source=("$url/archive/$pkgname-$pkgver.tar.gz"
+source=("$url/releases/download/v$pkgver/ypbind-mt-$pkgver.tar.xz"
         'ypbind.service'
-        'ypbind.conf'
-        'fixes.patch')
-
-prepare() {
-  cd $pkgname-$pkgname-$pkgver
-  patch -Np2 -b -z .orig <../fixes.patch
-  ./autogen.sh
-}
+        'ypbind.conf')
 
 build() {
-  cd $pkgname-$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sbindir=/usr/bin
   make V=0
 }
 
 package() {
-  cd $pkgname-$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
   install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
   install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
   install -D -m644 ../ypbind.conf "${pkgdir}"/usr/lib/tmpfiles.d/ypbind.conf
 }
 
-md5sums=('11f09789cc8bb4d844798c3535c30208'
+md5sums=('86a724d30dd8d65f53a4de28b7344ca1'
          '50e05f057ec0603243e3d334aaa0934f'
-         '3d6a8eb44771f81abb47d14d9e4f301d'
-         '17374b15cfa85bae36ee1948600821e6')
+         '3d6a8eb44771f81abb47d14d9e4f301d')
diff --git a/fixes.patch b/fixes.patch
deleted file mode 100644
index e9a53f717e6f..000000000000
--- a/fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up src/ypbind-mt-ypbind-mt-2.4/configure.ac.orig src/ypbind-mt-ypbind-mt-2.4/configure.ac
---- src/ypbind-mt-ypbind-mt-2.4/configure.ac.orig	2016-03-02 07:12:27.000000000 -0700
-+++ src/ypbind-mt-ypbind-mt-2.4/configure.ac	2018-04-28 03:27:33.000000000 -0600
-@@ -26,7 +26,7 @@ AC_CHECK_LIB(pthread, pthread_create)
- 
- PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0])
- AC_SUBST(USE_SD_NOTIFY)
--#PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL_LIBS="-lnsl"],[LIBNSL_LIBS=""])])
-+#PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[NSL_LIBS="-lnsl"],[NSL_LIBS=""])])
- PKG_CHECK_MODULES([NSL], [libnsl])
- PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [TIRPC_LIBS=""])
- if test -n "$TIRPC_LIBS"; then
-diff -up src/ypbind-mt-ypbind-mt-2.4/src/ypbind-mt.c.orig src/ypbind-mt-ypbind-mt-2.4/src/ypbind-mt.c
---- src/ypbind-mt-ypbind-mt-2.4/src/ypbind-mt.c.orig	2018-04-28 03:28:56.000000000 -0600
-+++ src/ypbind-mt-ypbind-mt-2.4/src/ypbind-mt.c	2018-04-28 03:29:49.000000000 -0600
-@@ -278,7 +278,7 @@ create_pidfile (void)
-   struct flock lock;
-   int left, written;
-   pid_t pid;
--  char pbuf[10], *ptr;
-+  char pbuf[14], *ptr;
-   int flags;
- 
-   lock_fd = open (_YPBIND_PIDFILE, O_CREAT | O_RDWR,