aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/sudo/APKBUILD22
-rw-r--r--main/sudo/fix-cross-compile.patch18
-rw-r--r--main/sudo/libcrypt.patch12
3 files changed, 27 insertions, 25 deletions
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
index a21f2bd695..a38e164ba9 100644
--- a/main/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sudo
-pkgver=1.8.10_p3
+pkgver=1.8.11_p2
if [ "${pkgver%_*}" != "$pkgver" ]; then
_realver=${pkgver%_*}${pkgver#*_}
else
@@ -36,6 +36,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
+ --libexecdir=/usr/lib \
--with-env-editor \
--without-pam \
--without-skey \
@@ -50,17 +51,18 @@ package() {
# path components with bad permissions. fix this.
install -d -m0755 "$pkgdir"/var "$pkgdir"/var/db || return 1
make -j1 DESTDIR="$pkgdir" install || return 1
+ rm "$pkgdir"/usr/lib/sudo/*.la
}
-md5sums="fcd8d0d9f9f0397d076ee901e242ed39 sudo-1.8.10p3.tar.gz
-44a4afb9ac22947ad6a05777ce66c5fc fix-cross-compile.patch
-e6384e3c40ebbf7cb92722acb8b9e467 libcrypt.patch
+md5sums="84012b4871b6c775c957cd310d5bad87 sudo-1.8.11p2.tar.gz
+91e1a494af992cc9e598f8bb715a13c9 fix-cross-compile.patch
+048e1cc360537bcea5b74a874fd41674 libcrypt.patch
2cfe0d309d42e7278bea325059b48eb5 domain.patch"
-sha256sums="6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400 sudo-1.8.10p3.tar.gz
-d40eaf27f9bcc4d2151c3133fe12efcf29fe496a4d72dabe22661cf311943f59 fix-cross-compile.patch
-e26a4e01b275a306b13fb7a5253c342d975892b3b3d136290e28a63a1b1f418b libcrypt.patch
+sha256sums="8133849418fa18cf6b6bb6893d1855ff7afe21db8923234a00bf045c90fba1ad sudo-1.8.11p2.tar.gz
+7683c69c977b276882922b826b9166bc0ec8c82e1ca8c97d6d93f4738c0c6a5e fix-cross-compile.patch
+d26dc7aaa958d988bbb7efaa0118d23e06375cc90868d14d4b2620f55589cb41 libcrypt.patch
1f455dc37a88089017d580a66e805c3e2ad144f16a304ee457b6cfa8668d18dd domain.patch"
-sha512sums="714e20d7ea0e76b24acfa73818644fdf4094374b2000ef0cb879a92273230fdc2bda4cab041f224f19b57149f2ae289c377c693d3bca5a2d5e1bba79cf97c434 sudo-1.8.10p3.tar.gz
-f9257262b32365f1ee8914781f917fc425229f88d3d8df0f33ebb2cfbf0ad8d41a6ea83b15b2c74b1f5728b380bcd1e92ca58e138717e5104a35c2fc8a376ea1 fix-cross-compile.patch
-5444e9c6c01d42c8e1ed701f67a9394f42bbe435c0d6c82ffbfbaa661f0e19ed1d6cb31d3c57db3559707d64a68445845673be547cd3586c73c03ddb408108de libcrypt.patch
+sha512sums="fdd6c14c3738cb7bafec9873c49f96270fdd36c72d14d3fc7e1ef3651275961bf17550ac1f56ed445b394985cbbf602b88f52cda1226e9007bed14a4d4fadbaa sudo-1.8.11p2.tar.gz
+4da8baf526dc7b7dac5cc067e52d5ae464b82337ac5d520641b3d93af2cfa4f2d3897f4e6602f988a194b7260e3edea9c57ccfc07a3eed7e9967956851997950 fix-cross-compile.patch
+5ad20254aa587ef615f794081ecd55344eada5cf8c1a1d7956cc3f73375554716c483eeb74081da9a8501afce92cfbaf2abe59d1067aac67ce6e4874eb5a23e1 libcrypt.patch
66c724d8e062745be669625dfdf08ee78e04b8b1f28ae61f49d38a952e52045229bbe3d9e0ecfe8e00d1a53db082488198054d23377bf11706bfbefd59068d3d domain.patch"
diff --git a/main/sudo/fix-cross-compile.patch b/main/sudo/fix-cross-compile.patch
index 89fcd043f1..f9993fa880 100644
--- a/main/sudo/fix-cross-compile.patch
+++ b/main/sudo/fix-cross-compile.patch
@@ -1,15 +1,15 @@
---- sudo-1.8.7/compat/Makefile.in.orig
-+++ sudo-1.8.7/compat/Makefile.in
-@@ -93,10 +93,10 @@
+--- ./lib/util/Makefile.in.orig
++++ ./lib/util/Makefile.in
+@@ -148,10 +148,10 @@
./mksigname > $@
- mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
+ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
+- $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
+ $${HOSTCC:-gcc} -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(DEFS) $(srcdir)/mksiglist.c -o $@
- mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/missing.h $(top_builddir)/config.h
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@
+ mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
+- $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@
+ $${HOSTCC:-gcc} -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(DEFS) $(srcdir)/mksigname.c -o $@
- fnm_test: fnm_test.o libreplace.la
- $(LIBTOOL) --mode=link $(CC) -o $@ fnm_test.o libreplace.la $(PIE_LDFLAGS) $(SSP_LDFLAGS)
+ $(srcdir)/mksiglist.h: $(srcdir)/siglist.in
+ @if [ -n "$(DEVEL)" ]; then \
diff --git a/main/sudo/libcrypt.patch b/main/sudo/libcrypt.patch
index f99b781c21..e83b691134 100644
--- a/main/sudo/libcrypt.patch
+++ b/main/sudo/libcrypt.patch
@@ -1,11 +1,11 @@
--- ./plugins/sudoers/Makefile.in.orig
+++ ./plugins/sudoers/Makefile.in
-@@ -49,7 +49,7 @@
- LT_LIBS = $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la
+@@ -52,7 +52,7 @@
+ LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
LIBS = $(LT_LIBS) @LIBINTL@
NET_LIBS = @NET_LIBS@
--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
+-SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@
++SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@ -lcrypt
REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@
-
- # C preprocessor flags
+ VISUDO_LIBS = $(NET_LIBS) @LIBMD@
+ TESTSUDOERS_LIBS = $(NET_LIBS) @LIBMD@