diff --git a/srcpkgs/socklog/patches/cross.patch b/srcpkgs/socklog/patches/cross.patch deleted file mode 100644 index 99e4d493812..00000000000 --- a/srcpkgs/socklog/patches/cross.patch +++ /dev/null @@ -1,48 +0,0 @@ -chskshsgr must be built for the host. - ---- a/src/Makefile 2014-07-18 18:38:30.305068171 +0200 -+++ b/src/Makefile 2014-07-18 18:40:28.028069614 +0200 -@@ -117,11 +117,11 @@ - byte_zero.o: byte.h byte_zero.c compile - ./compile byte_zero.c - --chkshsgr: chkshsgr.o load -- ./load chkshsgr -+chkshsgr: chkshsgr.o loadhost -+ ./loadhost chkshsgr - --chkshsgr.o: chkshsgr.c compile -- ./compile chkshsgr.c -+chkshsgr.o: chkshsgr.c compilehost -+ ./compilehost chkshsgr.c - - choose: choose.sh warn-auto.sh - rm -f choose -@@ -137,6 +137,11 @@ - sh print-cc.sh > compile - chmod 555 compile - -+compilehost: -+ cat warn-auto.sh > compilehost -+ @echo 'exec cc -c $${1+"$$@"}' >> compilehost -+ chmod 555 compilehost -+ - direntry.h: choose compile direntry.h1 direntry.h2 trydrent.c - ./choose c trydrent direntry.h1 direntry.h2 > direntry.h - -@@ -198,6 +203,15 @@ - sh print-ld.sh > load - chmod 555 load - -+loadhost: -+ rm -f loadhost -+ @echo > loadhost -+ @echo 'systype="`cat systype`"' >> loadhost -+ @echo 'cat warn-auto.sh' >> loadhost -+ @echo 'main="$$1"; shift' >> loadhost -+ @echo 'exec cc -o "$$main" "$$main".o $${1+"$$@"}' >> loadhost -+ chmod 555 loadhost -+ - lock_ex.o: compile hasflock.h lock.h lock_ex.c - ./compile lock_ex.c - diff --git a/srcpkgs/socklog/template b/srcpkgs/socklog/template index 4cbbbe3273b..764bd6299b2 100644 --- a/srcpkgs/socklog/template +++ b/srcpkgs/socklog/template @@ -1,15 +1,14 @@ # Template file for 'socklog' pkgname=socklog -version=2.1.0 -revision=6 +version=2.1.1 +revision=1 build_wrksrc="${pkgname}-${version}" short_desc="Small and secure syslogd replacement for use with runit" maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="http://smarden.org/socklog/" distfiles="http://smarden.org/socklog/socklog-${version}.tar.gz" -checksum=aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455 -patch_args="-Np1 --directory=${build_wrksrc}" +checksum=eb1937241d6c7b2a0402b49ffdebf022bb2fcda3e00c1b1a17ae8bcf1e4a39ba build_options="static"