Update more packages

6 files changed, 22 insertions, 114 deletions

diff --git a/data/launchd/_metadata/version b/data/launchd/_metadata/version
index bb6d31c0c..6524baf05 100644
--- a/data/launchd/_metadata/version
+++ b/data/launchd/_metadata/version
@@ -1 +1 @@
-258.18
+842.92.1
diff --git a/data/launchd/launchd-258.18.tar.gz b/data/launchd/launchd-258.18.tar.gz
deleted file mode 100644
index b5e4ffc67..000000000
--- a/data/launchd/launchd-258.18.tar.gz
+++ /dev/null
diff --git a/data/launchd/launchd-842.92.1.tar.gz b/data/launchd/launchd-842.92.1.tar.gz
new file mode 100644
index 000000000..afbf09133
--- /dev/null
+++ b/data/launchd/launchd-842.92.1.tar.gz
diff --git a/data/launchd/make.sh b/data/launchd/make.sh
index cf4270d30..6bb833073 100644
--- a/data/launchd/make.sh
+++ b/data/launchd/make.sh
@@ -1,6 +1,7 @@
-pkg:setup
-cd launchd
-pkg:configure --bindir=/bin --sbindir=/sbin --sysconfdir=/etc
-export SDKROOT=${PKG_ROOT}
-make
-pkg:install
+pkg:extract
+cd *
+pkg:patch 
+#${PKG_TARG}-gcc -c liblaunch/liblaunch.c -o liblaunch.o -Isrc -miphoneos-version-min=11.0 -Iliblaunch
+${PKG_TARG}-gcc -DPRIVATE support/launchctl.c -o launchctl -Isrc -miphoneos-version-min=11.0 -Iliblaunch -I"$(PKG_DEST_ readline)/usr/include" -framework CoreFoundation -framework IOKit -lreadline -llaunch
+pkg: mkdir -p /usr/bin
+pkg: cp -a launchctl /usr/bin
diff --git a/data/launchd/port.diff b/data/launchd/port.diff
deleted file mode 100644
index 4bf2ee0af..000000000
--- a/data/launchd/port.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ru launchd-258.18/launchd/configure launchd-258.18+iPhone/launchd/configure
---- launchd-258.18/launchd/configure	2008-01-28 18:20:19.000000000 +0000
-+++ launchd-258.18+iPhone/launchd/configure	2008-11-24 10:24:21.000000000 +0000
-@@ -7863,13 +7863,8 @@
-   LIBS_ONLY_FALSE=
- fi
- 
-- if test $(tconf --test TARGET_OS_EMBEDDED) = YES; then
-   DO_EMBEDDED_MAGIC_TRUE=
-   DO_EMBEDDED_MAGIC_FALSE='#'
--else
--  DO_EMBEDDED_MAGIC_TRUE='#'
--  DO_EMBEDDED_MAGIC_FALSE=
--fi
- 
- 
- 
-diff -ru launchd-258.18/launchd/src/launchctl.c launchd-258.18+iPhone/launchd/src/launchctl.c
---- launchd-258.18/launchd/src/launchctl.c	2008-07-18 21:25:03.000000000 +0000
-+++ launchd-258.18+iPhone/launchd/src/launchctl.c	2008-11-24 10:27:33.000000000 +0000
-@@ -20,6 +20,8 @@
- 
- static const char *const __rcs_file_version__ = "$Revision: 23642 $";
- 
-+#define PRIVATE
-+
- #include "liblaunch_public.h"
- #include "liblaunch_private.h"
- #include "libbootstrap_public.h"
-@@ -74,6 +76,9 @@
- #include <sysexits.h>
- #include <util.h>
- 
-+#include <sys/sockio.h>
-+#include <mach/mach_error.h>
-+#include <sys/ioctl.h>
- 
- #define LAUNCH_SECDIR "/tmp/launch-XXXXXX"
- 
-diff -ru launchd-258.18/launchd/src/launchd_runtime.c launchd-258.18+iPhone/launchd/src/launchd_runtime.c
---- launchd-258.18/launchd/src/launchd_runtime.c	2008-03-04 17:48:07.000000000 +0000
-+++ launchd-258.18+iPhone/launchd/src/launchd_runtime.c	2008-11-24 10:37:16.000000000 +0000
-@@ -75,6 +75,8 @@
- static mach_port_t launchd_internal_port;
- static int mainkq;
- 
-+extern void mach_msg_destroy(mach_msg_header_t *mh);
-+
- #define BULK_KEV_MAX 100
- static struct kevent *bulk_kev;
- static int bulk_kev_i;
-diff -ru launchd-258.18/launchd/src/Makefile.am launchd-258.18+iPhone/launchd/src/Makefile.am
---- launchd-258.18/launchd/src/Makefile.am	2008-01-28 18:20:19.000000000 +0000
-+++ launchd-258.18+iPhone/launchd/src/Makefile.am	2008-11-24 10:32:27.000000000 +0000
-@@ -46,7 +46,7 @@
- sysconf_DATA = hostconfig rc.common rc.netboot
- 
- launchctl_CFLAGS = $(AM_CFLAGS) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
--launchctl_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library /usr/lib/libedit.dylib
-+launchctl_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library $(SDKROOT)/usr/lib/libedit.dylib
- 
- if DO_EMBEDDED_MAGIC
- else
-@@ -64,11 +64,11 @@
- 
- launchproxy_LDFLAGS = $(AM_LDFLAGS) $(WEAKLIBS_SECURITY)
- 
--notifyServer.c notifyServer.h: /usr/include/mach/notify.defs
--	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader notifyServer.h /usr/include/mach/notify.defs
-+notifyServer.c notifyServer.h: $(SDKROOT)/usr/include/mach/notify.defs
-+	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader notifyServer.h $(SDKROOT)/usr/include/mach/notify.defs
- 
--mach_excServer.c mach_excServer.h: /usr/include/mach/mach_exc.defs
--	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader mach_excServer.h /usr/include/mach/mach_exc.defs
-+mach_excServer.c mach_excServer.h: $(SDKROOT)/usr/include/mach/mach_exc.defs
-+	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader mach_excServer.h $(SDKROOT)/usr/include/mach/mach_exc.defs
- 
- job_replyUser.c job_reply.h: $(srcdir)/protocol_job_reply.defs
- 	mig $(MIGFLAGS) -sheader /dev/null -server /dev/null $(srcdir)/protocol_job_reply.defs
-diff -ru launchd-258.18/launchd/src/Makefile.in launchd-258.18+iPhone/launchd/src/Makefile.in
---- launchd-258.18/launchd/src/Makefile.in	2008-01-28 18:20:19.000000000 +0000
-+++ launchd-258.18+iPhone/launchd/src/Makefile.in	2008-11-24 10:32:41.000000000 +0000
-@@ -254,7 +254,7 @@
- @LIBS_ONLY_TRUE@liblaunch_profile_a_SOURCES = liblaunch.c libvproc.c libbootstrap.c protocol_vprocUser.c __version.c
- @LIBS_ONLY_FALSE@sysconf_DATA = hostconfig rc.common rc.netboot
- @LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
--@LIBS_ONLY_FALSE@launchctl_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library /usr/lib/libedit.dylib
-+@LIBS_ONLY_FALSE@launchctl_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit $(LIBS_SECURITY) -weak_library $(SDKROOT)/usr/lib/libedit.dylib
- @DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS)
- @DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework IOKit
- @DO_EMBEDDED_MAGIC_FALSE@@LIBS_ONLY_FALSE@SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c
-@@ -1174,11 +1174,11 @@
- @LIBS_ONLY_FALSE@launchd_runtime.c:: notifyServer.h launchd_internal.h mach_excServer.h
- @LIBS_ONLY_FALSE@launchd_core_logic.c:: protocol_vproc.h job_reply.h protocol_vprocServer.h
- 
--@LIBS_ONLY_FALSE@notifyServer.c notifyServer.h: /usr/include/mach/notify.defs
--@LIBS_ONLY_FALSE@	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader notifyServer.h /usr/include/mach/notify.defs
-+@LIBS_ONLY_FALSE@notifyServer.c notifyServer.h: $(SDKROOT)/usr/include/mach/notify.defs
-+@LIBS_ONLY_FALSE@	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader notifyServer.h $(SDKROOT)/usr/include/mach/notify.defs
- 
--@LIBS_ONLY_FALSE@mach_excServer.c mach_excServer.h: /usr/include/mach/mach_exc.defs
--@LIBS_ONLY_FALSE@	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader mach_excServer.h /usr/include/mach/mach_exc.defs
-+@LIBS_ONLY_FALSE@mach_excServer.c mach_excServer.h: $(SDKROOT)/usr/include/mach/mach_exc.defs
-+@LIBS_ONLY_FALSE@	mig $(MIGFLAGS) -header /dev/null -user /dev/null -sheader mach_excServer.h $(SDKROOT)/usr/include/mach/mach_exc.defs
- 
- @LIBS_ONLY_FALSE@job_replyUser.c job_reply.h: $(srcdir)/protocol_job_reply.defs
- @LIBS_ONLY_FALSE@	mig $(MIGFLAGS) -sheader /dev/null -server /dev/null $(srcdir)/protocol_job_reply.defs
diff --git a/data/launchd/sockio.diff b/data/launchd/sockio.diff
new file mode 100644
index 000000000..d7be39318
--- /dev/null
+++ b/data/launchd/sockio.diff
@@ -0,0 +1,14 @@
+diff -ur launchd-842.92.1/support/launchctl.c launchd-842.92.1+iPhone/support/launchctl.c
+--- launchd-842.92.1/support/launchctl.c	2013-04-01 10:49:56.000000000 -1000
++++ launchd-842.92.1+iPhone/support/launchctl.c	2018-09-03 22:33:20.000000000 -1000
+@@ -39,9 +39,9 @@
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
++#include <sys/sockio.h>
+ #include <sys/un.h>
+ #include <sys/fcntl.h>
+ #include <sys/event.h>