From af936045ef07d4e9b4d2533fe48ebb4b2b7039f5 Mon Sep 17 00:00:00 2001 From: lod Date: Tue, 11 Jun 2019 02:24:19 +0200 Subject: [PATCH] applied patches from debian package --- .SRCINFO | 6 +++--- PKGBUILD | 23 ++++++++++++++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f548868..470b03b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,16 @@ -# Generated by mksrcinfo v8 -# Sat Nov 18 16:25:32 UTC 2017 pkgbase = libnss-extrausers pkgdesc = nss module to have an additional passwd, shadow and group file pkgver = 0.6 - pkgrel = 3 + pkgrel = 4 url = https://packages.debian.org/de/source/sid/libnss-extrausers arch = any license = GPL makedepends = gcc conflicts = libnss-extrausers-git source = http://http.debian.net/debian/pool/main/libn/libnss-extrausers/libnss-extrausers_0.6.orig.tar.gz + source = http://deb.debian.org/debian/pool/main/libn/libnss-extrausers/libnss-extrausers_0.6-4.debian.tar.xz sha256sums = 6a37c3cf6ff5dfd46b1b3127e1226404e43185fa73cd40e8144d5f7736eee9f0 + sha256sums = 851aeea268c0212702b78b66f8f16be15c0eddc241c5bc2df41b0825f3a65a5b pkgname = libnss-extrausers diff --git a/PKGBUILD b/PKGBUILD index 48cbe88..970eae5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,22 +1,35 @@ # Maintainer: lod pkgname=libnss-extrausers pkgver=0.6 -pkgrel=3 +pkgrel=4 pkgdesc="nss module to have an additional passwd, shadow and group file" arch=('any') url="https://packages.debian.org/de/source/sid/libnss-extrausers" license=('GPL') makedepends=('gcc') conflicts=('libnss-extrausers-git') -source=(http://http.debian.net/debian/pool/main/libn/$pkgname/${pkgname}_$pkgver.orig.tar.gz) -sha256sums=('6a37c3cf6ff5dfd46b1b3127e1226404e43185fa73cd40e8144d5f7736eee9f0') +source=(http://http.debian.net/debian/pool/main/libn/$pkgname/${pkgname}_$pkgver.orig.tar.gz + http://deb.debian.org/debian/pool/main/libn/$pkgname/${pkgname}_$pkgver-4.debian.tar.xz) +sha256sums=('6a37c3cf6ff5dfd46b1b3127e1226404e43185fa73cd40e8144d5f7736eee9f0' + '851aeea268c0212702b78b66f8f16be15c0eddc241c5bc2df41b0825f3a65a5b') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -Np1 -i ../debian/patches/0001-Bug-29915-CLO_EXEC.patch + patch -Np1 -i ../debian/patches/0002-Bug-29915-NSS-error-reporting.patch + patch -Np1 -i ../debian/patches/0003-Bug-29915-min-GID.patch + patch -Np1 -i ../debian/patches/0004-Bug-29915-fseek-thread-safety.patch + patch -Np1 -i ../debian/patches/0005-Bug-29915-strip-trailing-whitespace.patch + patch -Np1 -i ../debian/patches/0006-Bug-39775-Fix-setgrent.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${pkgname}-${pkgver} make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd ${pkgname}-${pkgver} make DESTDIR="$pkgdir" install }