Fix a bunch of stuff on rootless packages

ProcursusTeam · Jan 14, 2023 · e2c11a2 · e2c11a2
1 parent a1337e4
commit e2c11a2
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 57 deletions.
diff --git a/build_info/com.corellium.usbfluxd.plist b/build_info/com.corellium.usbfluxd.plist
@@ -6,7 +6,7 @@
 	<string>com.corellium.usbfluxd</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>/usr/sbin/usbfluxd</string>
+		<string>@MEMO_PREFIX@@MEMO_SUB_PREFIX@/sbin/usbfluxd</string>
 	</array>
 	<key>RunAtLoad</key>
 	<true/>

diff --git a/build_patch/usbfluxd/libplist.patch b/build_patch/usbfluxd/libplist.patch
diff --git a/makefiles/adv-cmds.mk b/makefiles/adv-cmds.mk
@@ -6,14 +6,15 @@ ifeq (,$(findstring darwin,$(MEMO_TARGET)))
 
 SUBPROJECTS      += adv-cmds
 ADV-CMDS_VERSION := 199.0.1
-DEB_ADV-CMDS_V   ?= $(ADV-CMDS_VERSION)
+DEB_ADV-CMDS_V   ?= $(ADV-CMDS_VERSION)-1
 
 adv-cmds-setup: setup
 	$(call GITHUB_ARCHIVE,apple-oss-distributions,adv_cmds,$(ADV-CMDS_VERSION),adv_cmds-$(ADV-CMDS_VERSION))
 	$(call EXTRACT_TAR,adv_cmds-$(ADV-CMDS_VERSION).tar.gz,adv_cmds-adv_cmds-$(ADV-CMDS_VERSION),adv-cmds)
 	mkdir -p $(BUILD_STAGE)/adv-cmds/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{bin,share/man/man{1,5}/}
 	$(call DOWNLOAD_FILES,$(BUILD_WORK)/adv-cmds/include,https://github.com/apple-oss-distributions/Libc/raw/Libc-1507.100.9/{nls/FreeBSD/msgcat$(comma)locale/FreeBSD/collate}.h)
 	$(call DOWNLOAD_FILES,$(BUILD_WORK)/adv-cmds/colldef,https://github.com/apple-oss-distributions/Liby/raw/Liby-20/libyywrap.c)
+	sed -i 's|/usr/share/locale|$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/locale|g' $(BUILD_WORK)/adv-cmds/locale/locale.cc
 
 ifneq ($(wildcard $(BUILD_WORK)/adv-cmds/.build_complete),)
 adv-cmds:

diff --git a/makefiles/dmg2img.mk b/makefiles/dmg2img.mk
@@ -4,7 +4,7 @@ endif
 
 SUBPROJECTS     += dmg2img
 DMG2IMG_VERSION := 1.6.7
-DEB_DMG2IMG_V   ?= $(DMG2IMG_VERSION)-1
+DEB_DMG2IMG_V   ?= $(DMG2IMG_VERSION)-2
 
 dmg2img-setup: setup
 	$(call DOWNLOAD_FILES,$(BUILD_SOURCE),http://vu1tur.eu.org/tools/dmg2img-$(DMG2IMG_VERSION).tar.gz)
@@ -20,7 +20,7 @@ dmg2img: dmg2img-setup openssl
 		CC="$(CC) $(LDFLAGS)" \
 		CFLAGS="$(CFLAGS)"
 	+$(MAKE) -C $(BUILD_WORK)/dmg2img install \
-		DESTDIR="$(BUILD_STAGE)/dmg2img"
+		BIN_DIR="$(BUILD_STAGE)/dmg2img/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin"
 	$(INSTALL) -Dm644 $(BUILD_WORK)/dmg2img/vfdecrypt.1 $(BUILD_STAGE)/dmg2img/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vfdecrypt.1
 	$(INSTALL) -Dm644 $(BUILD_INFO)/dmg2img.1 $(BUILD_STAGE)/dmg2img/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/dmg2img.1
 	$(call AFTER_BUILD)

diff --git a/makefiles/golb.mk b/makefiles/golb.mk
@@ -42,7 +42,7 @@ golb-package: golb-stage
 	mkdir -p $(BUILD_DIST)/golb
 
 	# golb.mk Prep golb
-	cp -a $(BUILD_STAGE)/golb/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/golb
+	cp -a $(BUILD_STAGE)/golb $(BUILD_DIST)/
 
 	# golb.mk Sign
 	$(call SIGN,golb,tfp0.xml)
@@ -55,4 +55,4 @@ golb-package: golb-stage
 
 .PHONY: golb golb-package
 
-endif
+endif
diff --git a/makefiles/inetutils.mk b/makefiles/inetutils.mk
@@ -4,14 +4,14 @@ endif
 
 SUBPROJECTS       += inetutils
 INETUTILS_VERSION := 2.0
-DEB_INETUTILS_V   ?= $(INETUTILS_VERSION)
+DEB_INETUTILS_V   ?= $(INETUTILS_VERSION)-1
 
 inetutils-setup: setup
 	$(call DOWNLOAD_FILES,$(BUILD_SOURCE),https://ftpmirror.gnu.org/inetutils/inetutils-$(INETUTILS_VERSION).tar.xz{$(comma).sig})
 	$(call PGP_VERIFY,inetutils-$(INETUTILS_VERSION).tar.xz)
 	$(call EXTRACT_TAR,inetutils-$(INETUTILS_VERSION).tar.xz,inetutils-$(INETUTILS_VERSION),inetutils)
 	$(call DO_PATCH,inetutils,inetutils,-p1)
-	mkdir -p $(BUILD_STAGE)/inetutils/{s,}bin
+	mkdir -p $(BUILD_STAGE)/inetutils/$(MEMO_PREFIX)/{s,}bin
 
 ifneq ($(wildcard $(BUILD_WORK)/inetutils/.build_complete),)
 inetutils:
@@ -31,8 +31,8 @@ inetutils: inetutils-setup ncurses readline
 	touch $(BUILD_WORK)/inetutils/man/*.8 $(BUILD_WORK)/inetutils/man/*.1
 	+$(MAKE) -C $(BUILD_WORK)/inetutils install \
 		DESTDIR=$(BUILD_STAGE)/inetutils
-	$(LN_S) ../$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/ping $(BUILD_STAGE)/inetutils/bin
-	$(LN_S) ../$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/ping $(BUILD_STAGE)/inetutils/sbin
+	$(LN_SR) $(BUILD_STAGE)/inetutils/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/ping $(BUILD_STAGE)/inetutils/$(MEMO_PREFIX)/bin/ping
+	$(LN_SR) $(BUILD_STAGE)/inetutils/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/ping $(BUILD_STAGE)/inetutils/$(MEMO_PREFIX)/sbin/ping
 	$(call AFTER_BUILD)
 endif
 

diff --git a/makefiles/libpthread-stubs.mk b/makefiles/libpthread-stubs.mk
@@ -29,7 +29,7 @@ libpthread-stubs-package: libpthread-stubs-stage
 	mkdir -p $(BUILD_DIST)/libpthread-stubs0-dev
 
 	# libpthread-stubs.mk Prep libpthread-stubs0-dev
-	cp -a $(BUILD_STAGE)/libpthread-stubs/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/libpthread-stubs0-dev
+	cp -a $(BUILD_STAGE)/libpthread-stubs $(BUILD_DIST)/libpthread-stubs0-dev
 
 	# libpthread-stubs.mk Make .debs
 	$(call PACK,libpthread-stubs0-dev,DEB_LIBPTHREAD-STUBS_V)

diff --git a/makefiles/netcat.mk b/makefiles/netcat.mk
@@ -30,7 +30,7 @@ netcat-package: netcat-stage
 	mkdir -p $(BUILD_DIST)/netcat
 
 	# netcat.mk Prep netcat
-	cp -a $(BUILD_STAGE)/netcat/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/netcat
+	cp -a $(BUILD_STAGE)/netcat $(BUILD_DIST)/
 
 	# netcat.mk Sign
 	$(call SIGN,netcat,general.xml)

diff --git a/makefiles/network-cmds.mk b/makefiles/network-cmds.mk
@@ -6,7 +6,7 @@ ifeq (,$(findstring darwin,$(MEMO_TARGET)))
 
 SUBPROJECTS          += network-cmds
 NETWORK-CMDS_VERSION := 641
-DEB_NETWORK-CMDS_V   ?= $(NETWORK-CMDS_VERSION)
+DEB_NETWORK-CMDS_V   ?= $(NETWORK-CMDS_VERSION)-1
 
 network-cmds-setup: setup
 	$(call GITHUB_ARCHIVE,apple-oss-distributions,network_cmds,$(NETWORK-CMDS_VERSION),network_cmds-$(NETWORK-CMDS_VERSION))
@@ -72,9 +72,9 @@ network-cmds: network-cmds-setup libpcap
 	cp -a $(BUILD_WORK)/network-cmds/{cfilutil,{netstat,mnc}.tproj}/*.1 $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1
 	cd $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin; \
 	for bin in ifconfig ip6addrctl netstat ping6 route rtsol; do \
-		$(LN_S) ../$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/$$bin $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)/sbin; \
+		$(LN_SR) $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/$$bin $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)/sbin; \
 	done
-	$(LN_S) ../$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/ping6 $(BUILD_STAGE)/network-cmds/bin
+	$(LN_SR) $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/sbin/ping6 $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)/bin
 	sed -e 's|/var|$(MEMO_PREFIX)/var|g' -e 's|/usr|$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)|g' < $(BUILD_WORK)/network-cmds/kdumpd.tproj/com.apple.kdumpd.plist > $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)/Library/LaunchDaemons/com.apple.kdumpd.plist
 	chmod 1755 $(BUILD_STAGE)/network-cmds/$(MEMO_PREFIX)/var/tmp/PanicDumps
 	$(call AFTER_BUILD)

diff --git a/makefiles/pincrush.mk b/makefiles/pincrush.mk
@@ -4,7 +4,7 @@ endif
 
 SUBPROJECTS      += pincrush
 PINCRUSH_VERSION := 0.9.2
-DEB_PINCRUSH_V   ?= $(PINCRUSH_VERSION)
+DEB_PINCRUSH_V   ?= $(PINCRUSH_VERSION)-1
 
 pincrush-setup: setup
 	$(call GITHUB_ARCHIVE,DHowett,pincrush,$(PINCRUSH_VERSION),$(PINCRUSH_VERSION))
@@ -28,7 +28,7 @@ pincrush-package: pincrush-stage
 	mkdir -p $(BUILD_DIST)/pincrush
 
 	# pincrush.mk Prep pincrush
-	cp -a $(BUILD_STAGE)/pincrush/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/pincrush
+	cp -a $(BUILD_STAGE)/pincrush/ $(BUILD_DIST)/
 
 	# pincrush.mk Sign
 	$(call SIGN,pincrush,general.xml)

diff --git a/makefiles/sensible-utils.mk b/makefiles/sensible-utils.mk
@@ -4,7 +4,7 @@ endif
 
 SUBPROJECTS            += sensible-utils
 SENSIBLE-UTILS_VERSION := 0.0.17
-DEB_SENSIBLE-UTILS_V   ?= $(SENSIBLE-UTILS_VERSION)
+DEB_SENSIBLE-UTILS_V   ?= $(SENSIBLE-UTILS_VERSION)-1
 
 sensible-utils-setup: setup
 	$(call DOWNLOAD_FILES,$(BUILD_SOURCE),http://deb.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_$(SENSIBLE-UTILS_VERSION).tar.xz)
@@ -29,7 +29,7 @@ sensible-utils-package: sensible-utils-stage
 	mkdir -p $(BUILD_DIST)/sensible-utils
 
 	# sensible-utils.mk Prep sensible-utils
-	cp -a $(BUILD_STAGE)/sensible-utils/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/sensible-utils
+	cp -a $(BUILD_STAGE)/sensible-utils/ $(BUILD_DIST)/
 
 	# sensible-utils.mk Sign
 	$(call SIGN,sensible-utils,general.xml)

diff --git a/makefiles/sudoku.mk b/makefiles/sudoku.mk
@@ -4,7 +4,7 @@ endif
 
 SUBPROJECTS     += sudoku
 SUDOKU_VERSION  := 1.0.5
-DEB_SUDOKU_V    ?= $(SUDOKU_VERSION)
+DEB_SUDOKU_V    ?= $(SUDOKU_VERSION)-1
 
 sudoku-setup: setup
 	$(call GITHUB_ARCHIVE,cinemast,sudoku,$(SUDOKU_VERSION),v$(SUDOKU_VERSION))
@@ -29,7 +29,7 @@ sudoku-package: sudoku-stage
 	mkdir -p $(BUILD_DIST)/sudoku
 
 	# sudoku.mk Prep sudoku
-	cp -a $(BUILD_STAGE)/sudoku/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/sudoku
+	cp -a $(BUILD_STAGE)/sudoku/ $(BUILD_DIST)/
 
 	# sudoku.mk Sign
 	$(call SIGN,sudoku,general.xml)

diff --git a/makefiles/transmission.mk b/makefiles/transmission.mk
@@ -4,7 +4,7 @@ endif
 
 SUBPROJECTS          += transmission
 TRANSMISSION_VERSION := 3.00
-DEB_TRANSMISSION_V   ?= $(TRANSMISSION_VERSION)-1
+DEB_TRANSMISSION_V   ?= $(TRANSMISSION_VERSION)-2
 
 transmission-setup: setup
 	$(call DOWNLOAD_FILES,$(BUILD_SOURCE),https://github.com/transmission/transmission-releases/raw/master/transmission-$(TRANSMISSION_VERSION).tar.xz)
@@ -34,7 +34,7 @@ transmission-package: transmission-stage
 	mkdir -p $(BUILD_DIST)/transmission
 
 	# transmission.mk Prep transmission
-	cp -a $(BUILD_STAGE)/transmission/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) $(BUILD_DIST)/transmission
+	cp -a $(BUILD_STAGE)/transmission/ $(BUILD_DIST)/
 
 	# transmission.mk Sign
 	$(call SIGN,transmission,general.xml)

diff --git a/makefiles/usbfluxd.mk b/makefiles/usbfluxd.mk
@@ -3,14 +3,13 @@ $(error Use the main Makefile)
 endif
 
 SUBPROJECTS      += usbfluxd
-USBFLUXD_COMMIT  := f1773325c7e197384bd6ac724f47b319dea3d2d4
-USBFLUXD_VERSION := 1.2.0+git20200925.$(shell echo $(USBFLUXD_COMMIT) | cut -c -7)
-DEB_USBFLUXD_V   ?= $(USBFLUXD_VERSION)-1
+USBFLUXD_COMMIT  := 0723a9a89a188de0949a6c80177705309ebb21f5
+USBFLUXD_VERSION := 1.2.0+git20210920.$(shell echo $(USBFLUXD_COMMIT) | cut -c -7)
+DEB_USBFLUXD_V   ?= $(USBFLUXD_VERSION)
 
 usbfluxd-setup: setup
 	$(call GITHUB_ARCHIVE,corellium,usbfluxd,$(USBFLUXD_VERSION),$(USBFLUXD_COMMIT))
 	$(call EXTRACT_TAR,usbfluxd-$(USBFLUXD_VERSION).tar.gz,usbfluxd-$(USBFLUXD_COMMIT),usbfluxd)
-	$(call DO_PATCH,usbfluxd,usbfluxd,-p1)
 
 ifneq ($(wildcard $(BUILD_WORK)/usbfluxd/.build_complete),)
 usbfluxd:
@@ -26,8 +25,8 @@ usbfluxd: usbfluxd-setup libplist
 		libplist_LIBS="-lplist-2.0"
 	+$(MAKE) -C $(BUILD_WORK)/usbfluxd install \
 		DESTDIR="$(BUILD_STAGE)/usbfluxd"
-	mkdir -p $(BUILD_STAGE)/usbfluxd/Library/LaunchDaemons
-	cp -a $(BUILD_INFO)/com.corellium.usbfluxd.plist $(BUILD_STAGE)/usbfluxd/Library/LaunchDaemons
+	mkdir -p $(BUILD_STAGE)/usbfluxd/$(MEMO_PREFIX)/Library/LaunchDaemons
+	sed -e "s|@MEMO_PREFIX@|$(MEMO_PREFIX)|g" -e "s|@MEMO_SUB_PREFIX@|$(MEMO_SUB_PREFIX)|g" < $(BUILD_INFO)/com.corellium.usbfluxd.plist > $(BUILD_STAGE)/usbfluxd/$(MEMO_PREFIX)/Library/LaunchDaemons/com.corellium.usbfluxd.plist
 	$(call AFTER_BUILD)
 endif
 

diff --git a/makefiles/usbmuxd.mk b/makefiles/usbmuxd.mk
@@ -7,12 +7,12 @@ ifeq (,$(findstring darwin,$(MEMO_TARGET)))
 SUBPROJECTS     += usbmuxd
 USBMUXD_COMMIT  := f50e52f3393a9149ac65fdda8f0d425109efc7fe
 USBMUXD_VERSION := 1.1.1+git20220619.$(shell echo $(USBMUXD_COMMIT) | cut -c -7)
-DEB_USBMUXD_V   ?= $(USBMUXD_VERSION)-1
+DEB_USBMUXD_V   ?= $(USBMUXD_VERSION)-2
 
 usbmuxd-setup: setup
 	$(call GITHUB_ARCHIVE,libimobiledevice,usbmuxd,$(USBMUXD_COMMIT),$(USBMUXD_COMMIT))
 	$(call EXTRACT_TAR,usbmuxd-$(USBMUXD_COMMIT).tar.gz,usbmuxd-$(USBMUXD_COMMIT),usbmuxd)
-	mkdir -p $(BUILD_STAGE)/usbmuxd/Library/LaunchDaemons
+	mkdir -p $(BUILD_STAGE)/usbmuxd/$(MEMO_PREFIX)/Library/LaunchDaemons
 
 ifneq ($(wildcard $(BUILD_WORK)/usbmuxd/.build_complete),)
 usbmuxd:
@@ -28,7 +28,7 @@ usbmuxd: usbmuxd-setup libusb libplist libimobiledevice-glue libimobiledevice
 		CFLAGS="$(CFLAGS) -I$(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/libusb-1.0"
 	+$(MAKE) -C $(BUILD_WORK)/usbmuxd install \
 		DESTDIR="$(BUILD_STAGE)/usbmuxd"
-	sed -e "s|@MEMO_PREFIX@|$(MEMO_PREFIX)|g" -e "s|@MEMO_SUB_PREFIX@|$(MEMO_SUB_PREFIX)|g" < $(BUILD_INFO)/org.libimobiledevice.usbmuxd.plist > $(BUILD_STAGE)/usbmuxd/Library/LaunchDaemons/org.libimobiledevice.usbmuxd.plist
+	sed -e "s|@MEMO_PREFIX@|$(MEMO_PREFIX)|g" -e "s|@MEMO_SUB_PREFIX@|$(MEMO_SUB_PREFIX)|g" < $(BUILD_INFO)/org.libimobiledevice.usbmuxd.plist > $(BUILD_STAGE)/usbmuxd/$(MEMO_PREFIX)/Library/LaunchDaemons/org.libimobiledevice.usbmuxd.plist
 	$(call AFTER_BUILD)
 endif
 

diff --git a/makefiles/usbmuxd2.mk b/makefiles/usbmuxd2.mk
@@ -7,7 +7,7 @@ ifeq (,$(findstring darwin,$(MEMO_TARGET)))
 SUBPROJECTS      += usbmuxd2
 USBMUXD2_COMMIT  := 753b79eaf317c56df6c8b1fb6da5847cc54a0bb0
 USBMUXD2_VERSION := 46
-DEB_USBMUXD2_V   ?= $(USBMUXD2_VERSION)
+DEB_USBMUXD2_V   ?= $(USBMUXD2_VERSION)-1
 
 
 usbmuxd2-setup: setup
@@ -27,8 +27,8 @@ usbmuxd2: usbmuxd2-setup libgeneral libusb libplist libimobiledevice
 	+$(MAKE) -C $(BUILD_WORK)/usbmuxd2
 	+$(MAKE) -C $(BUILD_WORK)/usbmuxd2 install \
 		DESTDIR="$(BUILD_STAGE)/usbmuxd2"
-	mkdir -p $(BUILD_STAGE)/usbmuxd2/Library/LaunchDaemons
-	cp -a $(BUILD_INFO)/org.libimobiledevice.usbmuxd.plist $(BUILD_STAGE)/usbmuxd2/Library/LaunchDaemons
+	mkdir -p $(BUILD_STAGE)/usbmuxd2/$(MEMO_PREFIX)/Library/LaunchDaemons
+	sed -e "s|@MEMO_PREFIX@|$(MEMO_PREFIX)|g" -e "s|@MEMO_SUB_PREFIX@|$(MEMO_SUB_PREFIX)|g" < $(BUILD_INFO)/org.libimobiledevice.usbmuxd.plist > $(BUILD_STAGE)/usbmuxd2/$(MEMO_PREFIX)/Library/LaunchDaemons/org.libimobiledevice.usbmuxd.plist
 	$(call AFTER_BUILD)
 endif
 

diff --git a/makefiles/whois.mk b/makefiles/whois.mk
@@ -22,11 +22,13 @@ else
 whois: whois-setup libidn2
 endif
 	+$(MAKE) -C $(BUILD_WORK)/whois \
+		prefix="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)" \
 		HAVE_ICONV=1 \
 		CC="$(CC)" \
 		CFLAGS='$(CFLAGS) -Wall -I.' \
 		LDFLAGS='$(LDFLAGS) -liconv'
 	+$(MAKE) -C $(BUILD_WORK)/whois install \
+		prefix="$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)" \
 		DESTDIR=$(BUILD_STAGE)/whois
 	$(call AFTER_BUILD)
 endif