diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/eglibc/files/libc.so.sparc64 | 5 | ||||
| -rw-r--r-- | package/ipsec-tools/Makefile | 7 | ||||
| -rw-r--r-- | package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in | 24 | ||||
| -rw-r--r-- | package/ipvsadm/Makefile | 2 | ||||
| -rw-r--r-- | package/ipvsadm/patches/patch-libipvs_ip_vs_h | 10 | ||||
| -rw-r--r-- | package/vsftpd/Makefile | 2 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-Makefile | 4 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-sysdeputil_c | 13 |
8 files changed, 59 insertions, 8 deletions
diff --git a/package/eglibc/files/libc.so.sparc64 b/package/eglibc/files/libc.so.sparc64 new file mode 100644 index 000000000..2b0324525 --- /dev/null +++ b/package/eglibc/files/libc.so.sparc64 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf64-sparc) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 781aefb6f..bdcdf3cac 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipsec-tools -PKG_VERSION:= 0.8.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= d38b39f291ba2962387c3232e7335dd8 +PKG_VERSION:= 0.8.0 +PKG_RELEASE:= 2 +PKG_MD5SUM:= b79aae3055a51f8de5c0f1b8ca6cf619 PKG_DESCR:= IPsec management tools PKG_SECTION:= net/security PKG_BUILDDEP:= openssl flex @@ -26,7 +26,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -TARGET_CPPFLAGS+= -I${LINUX_DIR}/include CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \ --without-readline \ --disable-security-context \ diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in new file mode 100644 index 000000000..f594f5d92 --- /dev/null +++ b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in @@ -0,0 +1,24 @@ +--- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in 2011-03-18 14:27:40.000000000 +0100 ++++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in 2013-07-17 14:35:36.000000000 +0200 +@@ -183,7 +183,7 @@ EXTRA_DIST = \ + netinet/ipsec.h \ + sys/queue.h + +-DISTCLEANFILES = .includes linux ++DISTCLEANFILES = linux + all: all-am + + .SUFFIXES: +@@ -370,11 +370,7 @@ uninstall-am: + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +-.includes: ${top_builddir}/config.status +- ln -sf $(KERNEL_INCLUDE)/linux +- touch .includes +- +-all: .includes ++all: + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index 09004b2e3..1f992de47 100644 --- a/package/ipvsadm/Makefile +++ b/package/ipvsadm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ipvsadm PKG_VERSION:= 1.26 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= eac3ba3f62cd4dea2da353aeddd353a8 PKG_DESCR:= IPVS admin utility PKG_SECTION:= net diff --git a/package/ipvsadm/patches/patch-libipvs_ip_vs_h b/package/ipvsadm/patches/patch-libipvs_ip_vs_h new file mode 100644 index 000000000..479b8ab48 --- /dev/null +++ b/package/ipvsadm/patches/patch-libipvs_ip_vs_h @@ -0,0 +1,10 @@ +--- ipvsadm-1.26.orig/libipvs/ip_vs.h 2011-02-07 03:38:57.000000000 +0100 ++++ ipvsadm-1.26/libipvs/ip_vs.h 2014-02-11 12:45:07.000000000 +0100 +@@ -10,6 +10,7 @@ + #include <sys/socket.h> + #include <arpa/inet.h> + #include <linux/types.h> /* For __beXX types in userland */ ++#include <sys/types.h> + + #ifdef LIBIPVS_USE_NL + #include <netlink/netlink.h> diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 982cc111e..5d42e38da 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vsftpd PKG_VERSION:= 3.0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8b00c749719089401315bd3c44dddbb2 PKG_DESCR:= a fast and secure FTP server PKG_SECTION:= www diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile index fecf5ff17..1549bc920 100644 --- a/package/vsftpd/patches/patch-Makefile +++ b/package/vsftpd/patches/patch-Makefile @@ -1,5 +1,5 @@ --- vsftpd-3.0.2.orig/Makefile 2012-09-16 09:27:35.000000000 +0200 -+++ vsftpd-3.0.2/Makefile 2013-11-09 11:38:47.000000000 +0100 ++++ vsftpd-3.0.2/Makefile 2014-02-11 12:59:30.000000000 +0100 @@ -1,16 +1,16 @@ # Makefile for systems with GNU tools -CC = gcc @@ -21,7 +21,7 @@ OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ tunables.o ftpdataio.o secbuf.o ls.o \ -@@ -29,21 +29,8 @@ vsftpd: $(OBJS) +@@ -29,21 +29,8 @@ vsftpd: $(OBJS) $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) install: diff --git a/package/vsftpd/patches/patch-sysdeputil_c b/package/vsftpd/patches/patch-sysdeputil_c new file mode 100644 index 000000000..693d90b63 --- /dev/null +++ b/package/vsftpd/patches/patch-sysdeputil_c @@ -0,0 +1,13 @@ +--- vsftpd-3.0.2.orig/sysdeputil.c 2012-09-16 06:18:04.000000000 +0200 ++++ vsftpd-3.0.2/sysdeputil.c 2014-02-11 14:21:18.000000000 +0100 +@@ -81,6 +81,10 @@ + #include <linux/unistd.h> + #include <errno.h> + #include <syscall.h> ++/* for musl */ ++#if !defined(__GLIBC__) ++#define WTMPX_FILE "/dev/null" ++#endif + #endif + + #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__) |