From 74686ff5738ed0443ab68bd1490910c8576a9c17 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 4 Nov 2017 20:07:27 +0000 Subject: fix bearssl, update musl, add socklog --- sub/socklog/Makefile | 32 ++++++++++++++++++++++++++++++++ sub/socklog/patch.sed | 5 +++++ 2 files changed, 37 insertions(+) create mode 100644 sub/socklog/Makefile create mode 100644 sub/socklog/patch.sed (limited to 'sub/socklog') diff --git a/sub/socklog/Makefile b/sub/socklog/Makefile new file mode 100644 index 0000000..e0c9673 --- /dev/null +++ b/sub/socklog/Makefile @@ -0,0 +1,32 @@ + +$(OUTPUT)/sources/socklog-2.1.0.tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget http://smarden.org/socklog/socklog-2.1.0.tar.gz + +$(OUTPUT)/sources/.lh_socklog_dled: $(OUTPUT)/sources/socklog-2.1.0.tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_socklog_copied: $(OUTPUT)/sources/.lh_socklog_dled | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/package/admin/socklog-2.1.0 + exec setuidgid $(NORMALUSER) s6-mkdir -p -- $(OUTPUT)/build-host/package + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/package tar zxpvf $(OUTPUT)/sources/socklog-2.1.0.tar.gz + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_socklog_patched: $(OUTPUT)/build-host/.lh_socklog_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) sed -f $(WD)/sub/socklog/patch.sed $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/Makefile > $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/Makefile.patched + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_socklog_configured: $(OUTPUT)/build-host/.lh_socklog_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) s6-echo "muslgcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h" > $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/conf-cc + exec setuidgid $(NORMALUSER) s6-echo "muslgcc -s -static" > $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/conf-ld + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_socklog_built: $(OUTPUT)/build-host/.lh_socklog_configured $(OUTPUT)/build-host/.lh_socklog_patched $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src $(MAKE) -f Makefile.patched socklog + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_socklog_installed: $(OUTPUT)/build-host/.lh_socklog_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec s6-mkdir -p -m 0755 $(OUTPUT)/rootfs/package/admin/socklog-2.1.0/command + exec makenamelink $(OUTPUT)/rootfs/package/admin socklog socklog-2.1.0 $(OUTPUT)/tmp + exec cp -f $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/socklog $(OUTPUT)/rootfs/package/admin/socklog-2.1.0/command/socklog + exec makelinks $(OUTPUT)/rootfs /command /package/admin/socklog/command + exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/socklog/patch.sed b/sub/socklog/patch.sed new file mode 100644 index 0000000..0540d27 --- /dev/null +++ b/sub/socklog/patch.sed @@ -0,0 +1,5 @@ +s/choose compile load tryshsgr\.c hasshsgr\.h1 hasshsgr\.h2 chkshsgr /choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 / +s/ar cr /$(TRIPLE)-ar cr / +s/ranlib /$(TRIPLE)-ranlib / +s%\./chkshsgr ||%true ||% +s%\./choose clr tryshsgr hasshsgr\.h1 hasshsgr\.h2 > hasshsgr\.h%cat hasshsgr.h1 > hasshsgr.h% -- cgit v1.2.3