diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-23 10:22:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-23 10:23:17 +0000 |
| commit | afcaedf7ca6789dd57de4ea93ce99defc79ffea6 (patch) | |
| tree | 8463259659b6aa133a81c7e40a3f89606363891a | |
| parent | c7bbdca2a256fe6abded086bf4e27338f78f67f9 (diff) | |
| download | aports-afcaedf7ca6789dd57de4ea93ce99defc79ffea6.tar.bz2 aports-afcaedf7ca6789dd57de4ea93ce99defc79ffea6.tar.xz | |
main/sudo: upgrade to 1.8.9_p4
| -rw-r--r-- | main/sudo/APKBUILD | 23 | ||||
| -rw-r--r-- | main/sudo/domain.patch | 12 | ||||
| -rw-r--r-- | main/sudo/libcrypt.patch | 10 |
3 files changed, 30 insertions, 15 deletions
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index c79cdda9ff..54abd91b96 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.8.8 +pkgver=1.8.9_p4 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else @@ -11,17 +11,17 @@ pkgdesc="Give certain users the ability to run some commands as root" url="http://www.sudo.ws/sudo/" arch="all" license='custom ISC' -makedepends="zlib-dev" +makedepends="zlib-dev bash" depends= subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_realver.tar.gz fix-cross-compile.patch - libcrypt.patch" + libcrypt.patch + domain.patch" _builddir="$srcdir"/$pkgname-$_realver prepare() { cd "$_builddir" - update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -51,12 +51,15 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="fc4f074090afd56d9ff4ff4e97321971 sudo-1.8.8.tar.gz +md5sums="a46f6de8645e6c5b6668d30657439d1c sudo-1.8.9p4.tar.gz 44a4afb9ac22947ad6a05777ce66c5fc fix-cross-compile.patch -429d9613091f1f3f19ce8def5b3032b3 libcrypt.patch" -sha256sums="9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9 sudo-1.8.8.tar.gz +e6384e3c40ebbf7cb92722acb8b9e467 libcrypt.patch +2cfe0d309d42e7278bea325059b48eb5 domain.patch" +sha256sums="1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7 sudo-1.8.9p4.tar.gz d40eaf27f9bcc4d2151c3133fe12efcf29fe496a4d72dabe22661cf311943f59 fix-cross-compile.patch -80d16a0b4ee7b97eed6806c4cf2c1b04c9d2ae3ec550bc97ed44ff6db8c8d556 libcrypt.patch" -sha512sums="e56ea849c2e6470a3d97fc76bde6af145938cf2df4d17f3faef00368262d8e2dd5bcc7e3adf490e853e23466b15638000a527156bd694ce4980003d751c896d5 sudo-1.8.8.tar.gz +e26a4e01b275a306b13fb7a5253c342d975892b3b3d136290e28a63a1b1f418b libcrypt.patch +1f455dc37a88089017d580a66e805c3e2ad144f16a304ee457b6cfa8668d18dd domain.patch" +sha512sums="755a7843cd94d55b841514034fff63e5a83b58d3d44e25588b657f87f7018908a6c27b00c5ca5393f2896266f4c4baf86ef71a582bc890a6253180f386cbc522 sudo-1.8.9p4.tar.gz f9257262b32365f1ee8914781f917fc425229f88d3d8df0f33ebb2cfbf0ad8d41a6ea83b15b2c74b1f5728b380bcd1e92ca58e138717e5104a35c2fc8a376ea1 fix-cross-compile.patch -e4b236c2ee47e01222eed98c401861336d49a0c74a28219972c68763a4c9233a010b315850f9f2f4396205dc21c4ce4eeb5c95101464f4f3040b70d25bd2116c libcrypt.patch" +5444e9c6c01d42c8e1ed701f67a9394f42bbe435c0d6c82ffbfbaa661f0e19ed1d6cb31d3c57db3559707d64a68445845673be547cd3586c73c03ddb408108de libcrypt.patch +66c724d8e062745be669625dfdf08ee78e04b8b1f28ae61f49d38a952e52045229bbe3d9e0ecfe8e00d1a53db082488198054d23377bf11706bfbefd59068d3d domain.patch" diff --git a/main/sudo/domain.patch b/main/sudo/domain.patch new file mode 100644 index 0000000000..49620ebdb6 --- /dev/null +++ b/main/sudo/domain.patch @@ -0,0 +1,12 @@ +--- ./plugins/sudoers/match.c.orig ++++ ./plugins/sudoers/match.c +@@ -933,8 +933,8 @@ + bool + netgr_matches(const char *netgr, const char *lhost, const char *shost, const char *user) + { ++ static char *domain = NULL; + #ifdef HAVE_INNETGR +- static char *domain; + static int initialized; + #endif + bool rc = false; diff --git a/main/sudo/libcrypt.patch b/main/sudo/libcrypt.patch index 0bab038632..f99b781c21 100644 --- a/main/sudo/libcrypt.patch +++ b/main/sudo/libcrypt.patch @@ -1,11 +1,11 @@ --- ./plugins/sudoers/Makefile.in.orig +++ ./plugins/sudoers/Makefile.in -@@ -45,7 +45,7 @@ - # Libraries - LIBS = $(top_builddir)/common/libcommon.la $(top_builddir)/@ac_config_libobj_dir@/libreplace.la +@@ -49,7 +49,7 @@ + LT_LIBS = $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la + LIBS = $(LT_LIBS) @LIBINTL@ NET_LIBS = @NET_LIBS@ --SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ -+SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ -lcrypt +-SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBDL@ ++SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBDL@ -lcrypt REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@ # C preprocessor flags |