diff --git a/srcpkgs/sudo/patches/mksigname-for-host.patch b/srcpkgs/sudo/patches/mksigname-for-host.patch index 500124a53a8..2021df4f9a9 100644 --- a/srcpkgs/sudo/patches/mksigname-for-host.patch +++ b/srcpkgs/sudo/patches/mksigname-for-host.patch @@ -1,17 +1,15 @@ -mksig{list,name} must be built for the host not target. - ---- lib/util/Makefile.in.orig 2015-03-19 17:17:25.578303273 +0100 -+++ lib/util/Makefile.in 2015-03-19 17:17:55.059482991 +0100 -@@ -146,10 +146,10 @@ signame.c: mksigname +--- lib/util/Makefile.in.orig 2015-07-17 07:53:22.343559193 +0200 ++++ lib/util/Makefile.in 2015-07-17 07:53:47.419297775 +0200 +@@ -160,10 +160,10 @@ signame.c: mksigname ./mksigname > $@ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h -- $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ -+ $(BUILD_CC) $(CPPFLAGS) $(BUILD_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ +- $(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@ ++ $(BUILD_CC) $(CPPFLAGS) $(BUILD_CFLAGS) $(srcdir)/mksiglist.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 $@ -+ $(BUILD_CC) $(CPPFLAGS) $(BUILD_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@ +- $(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@ ++ $(BUILD_CC) $(CPPFLAGS) $(BUILD_CFLAGS) $(srcdir)/mksigname.c -o $@ $(srcdir)/mksiglist.h: $(srcdir)/siglist.in @if [ -n "$(DEVEL)" ]; then \ diff --git a/srcpkgs/sudo/patches/musl.patch b/srcpkgs/sudo/patches/musl.patch new file mode 100644 index 00000000000..c48d84522e6 --- /dev/null +++ b/srcpkgs/sudo/patches/musl.patch @@ -0,0 +1,13 @@ +--- include/sudo_util.h.orig 2015-07-17 07:49:35.184634311 +0200 ++++ include/sudo_util.h 2015-07-17 07:50:05.018046508 +0200 +@@ -23,6 +23,10 @@ + # include "compat/stdbool.h" + #endif /* HAVE_STDBOOL_H */ + ++#ifdef HAVE_SYS_TYPES_H ++# include /* id_t */ ++#endif ++ + /* + * Macros for operating on struct timeval. + */ diff --git a/srcpkgs/sudo/patches/uid_t_needs_unistd.h.patch b/srcpkgs/sudo/patches/uid_t_needs_unistd.h.patch deleted file mode 100644 index 9d197052a16..00000000000 --- a/srcpkgs/sudo/patches/uid_t_needs_unistd.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/sudo_compat.h.orig 2015-03-17 11:02:15.190461995 +0100 -+++ include/sudo_compat.h 2015-03-17 11:02:36.493190547 +0100 -@@ -27,6 +27,7 @@ - # include - #endif - #include -+#include - - /* - * Macros and functions that may be missing on some operating systems. diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index fb316a64e26..5e7cc757b45 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -19,8 +19,6 @@ license="ISC, BSD, zlib" distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz" checksum=74308f7bf242f6f997d4c8145849581f06fb6fbe47032b6e87ac664c14b9f6d3 -broken=yes - pre_install() { find ${wrksrc} -type f -name Makefile -exec sed -i 's,$(INSTALL_OWNER),,g' {} \; }