summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/Config.in10
-rw-r--r--package/avahi/Makefile32
-rw-r--r--package/bind/Makefile28
-rw-r--r--package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c14
-rw-r--r--package/dhcp-forwarder/files/dhcp-forwarder.postinst3
-rw-r--r--package/dhcp/Makefile12
-rw-r--r--package/gettext/Makefile4
-rw-r--r--package/gnupg/Makefile (renamed from package/gpg/Makefile)20
-rw-r--r--package/gnupg/patches/patch-mpi_longlong_h (renamed from package/gpg/patches/patch-mpi_longlong_h)0
-rw-r--r--package/gnutls/Makefile13
-rw-r--r--package/heimdal/Makefile75
-rw-r--r--package/krb5/Makefile16
-rw-r--r--package/libgcrypt/Makefile17
-rw-r--r--package/libgpg-error/Makefile20
-rw-r--r--package/libtasn1/Makefile18
-rw-r--r--package/libtasn1/patches/patch-configure14
-rw-r--r--package/maradns/Makefile15
-rw-r--r--package/nand/Makefile39
-rw-r--r--package/nand/src/nanddump.c421
-rw-r--r--package/nand/src/nandwrite.c647
-rw-r--r--package/nfs-utils/Makefile2
-rw-r--r--package/ntfs-3g/Makefile14
-rw-r--r--package/opencdk/Makefile14
-rw-r--r--package/openssh/Makefile4
-rw-r--r--package/valgrind/Makefile16
-rw-r--r--target/linux/config/Config.in.block3
-rw-r--r--target/rb532/kernel.config4
-rw-r--r--target/rb532/patches/cfgfs.patch18
28 files changed, 1312 insertions, 181 deletions
diff --git a/package/Config.in b/package/Config.in
index 98b30b967..346672c77 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -44,7 +44,8 @@ endmenu
menu "Cryptography"
source "package/cryptsetup/Config.in"
-source "package/gpg/Config.in"
+source "package/gnupg/Config.in"
+source "package/gnutls/Config.in"
source "package/heimdal/Config.in"
source "package/krb5/Config.in"
source "package/openct/Config.in"
@@ -70,6 +71,7 @@ source "package/e2fsprogs/Config.in"
source "package/fuse/Config.in"
source "package/mdadm/Config.in"
source "package/mtd/Config.in"
+source "package/nand/Config.in"
source "package/lvm/Config.in"
source "package/parted/Config.in"
source "package/util-linux-ng/Config.in"
@@ -273,6 +275,7 @@ source "package/fontconfig/Config.in"
source "package/gettext/Config.in"
source "package/glib/Config.in"
source "package/gtk+/Config.in"
+source "package/heimdal/Config.in.lib"
source "package/id3lib/Config.in"
source "package/libao/Config.in"
source "package/libao/Config.in.lib"
@@ -314,7 +317,6 @@ source "package/libgssglue/Config.in"
source "package/libgssglue/Config.in.lib"
source "package/gmp/Config.in"
source "package/gmp/Config.in.lib"
-source "package/gnutls/Config.in"
source "package/gnutls/Config.in.lib"
source "package/libgpg-error/Config.in"
source "package/libgpg-error/Config.in.lib"
@@ -326,13 +328,13 @@ source "package/libid3tag/Config.in"
source "package/libid3tag/Config.in.lib"
source "package/jpeg/Config.in"
source "package/jpeg/Config.in.lib"
+source "package/krb5/Config.in.lib"
source "package/lame/Config.in.lib"
source "package/mpfr/Config.in"
source "package/mysql/Config.in"
source "package/mysql/Config.in.lib"
source "package/nspr/Config.in"
source "package/nss/Config.in"
-source "package/libtool/Config.in"
source "package/libtool/Config.in.lib"
source "package/openldap/Config.in.lib"
source "package/liblzo/Config.in"
@@ -359,6 +361,7 @@ source "package/libogg/Config.in.lib"
source "package/libol/Config.in"
source "package/libol/Config.in.lib"
source "package/opencdk/Config.in"
+source "package/opencdk/Config.in.lib"
source "package/obexftp/Config.in.lib"
source "package/openobex/Config.in"
source "package/libosip2/Config.in"
@@ -516,6 +519,7 @@ source "package/gcc/Config.in"
source "package/gperf/Config.in"
source "package/haserl/Config.in"
source "package/jamvm/Config.in"
+source "package/libtool/Config.in"
source "package/lua/Config.in"
source "package/m4/Config.in"
source "package/make/Config.in"
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index a85b4dcd1..231a97367 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -6,26 +6,25 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= avahi
PKG_VERSION:= 0.6.25
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libdaemon expat gdbm glib
PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e
PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
PKG_SECTION:= net
-PKG_DEPENDS:= libavahi libdaemon libexpat
+PKG_DEPENDS:= libavahi libdaemon libexpat gettext
+PKG_BUILDDEP+= libdaemon expat gdbm glib gettext
PKG_URL:= http://avahi.org
PKG_SITES:= http://avahi.org/download/
-PKG_DEPENDS_1:= libavahi libdaemon avahi-daemon
-PKG_DESCR_1:= Unicast DNS server from mDNS/DNS-SD configuration daemon
-PKG_DESCR_2:= DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library
-PKG_SECTION_2:= libs
+PKG_DEPENDS_DNSCONFD:= libavahi libdaemon avahi-daemon
+PKG_DESCR_DNSCONFD:= Unicast DNS server from mDNS/DNS-SD configuration daemon
+PKG_DESCR_LIB:= DNS-SD over mDNS library
include ${TOPDIR}/mk/package.mk
-TLDFLAGS+= -lintl
$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DNSCONFD},${PKG_DESCR_DNSCONFD},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs))
+TLDFLAGS+= -lintl
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-glib \
--disable-qt3 \
@@ -58,23 +57,28 @@ INSTALL_STYLE= auto
post-install:
# avahi daemon
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi
- ${INSTALL_DATA} ./files/avahi-daemon.conf ${IDIR_AVAHI_DAEMON}/etc/avahi/
+ ${INSTALL_DATA} ./files/avahi-daemon.conf \
+ ${IDIR_AVAHI_DAEMON}/etc/avahi/
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi/services
${INSTALL_DATA} ./files/service-http \
${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
${INSTALL_DATA} ./files/service-ssh \
${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/
+ ${CP} ${WRKINST}/usr/sbin/avahi-daemon \
+ ${IDIR_AVAHI_DAEMON}/usr/sbin/
# avahi dnsconfd
${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/etc/avahi
${CP} ${WRKINST}/etc/avahi/avahi-dnsconfd.action \
${IDIR_AVAHI_DNSCONFD}/etc/avahi/
${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
+ ${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd \
+ ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
# libavahi
${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libavahi-common.so.* ${IDIR_LIBAVAHI}/usr/lib/
- ${CP} ${WRKINST}/usr/lib/libavahi-core.so.* ${IDIR_LIBAVAHI}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libavahi-common.so* \
+ ${IDIR_LIBAVAHI}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libavahi-core.so* \
+ ${IDIR_LIBAVAHI}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bind/Makefile b/package/bind/Makefile
index e1adae348..2a75cfba4 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bind
-PKG_VERSION:= 9.4.1
-PKG_RELEASE:= 4
-PKG_BUILDDEP+= openssl
-PKG_MD5SUM:= 09b54d35036cb0423b2e618f21766285
+PKG_VERSION:= 9.6.1-P3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a0952d589b3051538033387be4c983f9
PKG_DESCR:= popular DNS server
PKG_SECTION:= net
PKG_DEPENDS:= libopenssl libbind
+PKG_BUILDDEP+= openssl
PKG_URL:= https://www.isc.org/software/bind
PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
@@ -22,13 +22,11 @@ PKG_DESCR_5:= dnssec-keygen & dnssec-signzone utilities
PKG_DESCR_6:= host utility
PKG_DESCR_7:= dig utility
-PKG_SECTION_2:= libs
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},libs))
$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
@@ -41,6 +39,7 @@ CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" \
CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \
--disable-threads \
--with-openssl=${STAGING_DIR}/usr/ \
+ --enable-epoll \
--with-libtool
BUILD_STYLE= auto
INSTALL_STYLE= auto
@@ -63,15 +62,20 @@ post-install:
# rndc
${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_RNDC}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen \
+ ${IDIR_BIND_RNDC}/usr/sbin/
# bind check
${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_CHECK}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_CHECK}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \
+ ${IDIR_BIND_CHECK}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \
+ ${IDIR_BIND_CHECK}/usr/sbin/
# dnsec tools
${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_DNSSEC}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_DNSSEC}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \
+ ${IDIR_BIND_DNSSEC}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \
+ ${IDIR_BIND_DNSSEC}/usr/sbin/
# host
${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_HOST}/usr/bin/
diff --git a/package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c b/package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c
deleted file mode 100644
index adb2aa906..000000000
--- a/package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bind-9.4.1.orig/lib/isc/unix/ifiter_ioctl.c 2006-02-04 00:51:38.000000000 +0100
-+++ bind-9.4.1/lib/isc/unix/ifiter_ioctl.c 2008-10-08 14:56:12.000000000 +0200
-@@ -479,8 +479,8 @@ linux_if_inet6_current(isc_interfaceiter
- for (i = 0; i < 16; i++) {
- unsigned char byte;
- static const char hex[] = "0123456789abcdef";
-- byte = ((index(hex, address[i * 2]) - hex) << 4) |
-- (index(hex, address[i * 2 + 1]) - hex);
-+ byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
-+ (strchr(hex, address[i * 2 + 1]) - hex);
- addr6.s6_addr[i] = byte;
- }
- iter->current.af = AF_INET6;
diff --git a/package/dhcp-forwarder/files/dhcp-forwarder.postinst b/package/dhcp-forwarder/files/dhcp-forwarder.postinst
index 9ba16f5b0..c08fed4f3 100644
--- a/package/dhcp-forwarder/files/dhcp-forwarder.postinst
+++ b/package/dhcp-forwarder/files/dhcp-forwarder.postinst
@@ -1,3 +1,6 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
+gid=$(get_next_gid)
+add_group dhcp-fwd $gid
+add_user dhcp-fwd $(get_next_uid) $gid /tmp
add_rcconf dhcp_fwd dhcp_fwd NO
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index f7b590cb0..d8ec43a10 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dhcp
-PKG_VERSION:= 4.1.0p1
+PKG_VERSION:= 4.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 325ff8338c5a21f89d5304ac13ffebdf
+PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18
PKG_DESCR:= ISC DHCP server
PKG_SECTION:= net
PKG_URL:= https://www.isc.org/software/dhcp
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_RELAY},${PKG_SECTION}))
-TCFLAGS+= -D_GNU_SOURCE
+#TCFLAGS+= -D_GNU_SOURCE
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_file__dev_random=yes
BUILD_STYLE:= auto
@@ -27,8 +27,10 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay \
+ ${IDIR_DHCP_RELAY}/usr/sbin/
${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd ${IDIR_DHCP_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd \
+ ${IDIR_DHCP_SERVER}/usr/sbin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 248eea1ea..0a06b3f32 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME= gettext
PKG_VERSION= 0.16.1
PKG_RELEASE= 1
-PKG_BUILDDEP+= libiconv libpthread
PKG_MD5SUM= 3d9ad24301c6d6b17ec30704a13fe127
PKG_DESCR:= internationalisation library
PKG_SECTION:= libs
PKG_DEPENDS:= libiconv libpthread
+PKG_BUILDDEP+= libiconv libpthread
PKG_URL:= http://www.gnu.org/software/gettext/
PKG_SITES:= ${MASTER_SITE_GNU:=gettext/}
ifeq ($(ADK_STATIC),y)
@@ -42,6 +42,6 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib
- ${CP} ${WRKINST}/usr/lib/*.so.* ${IDIR_GETTEXT}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_GETTEXT}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gpg/Makefile b/package/gnupg/Makefile
index 6ce049855..0a14439f5 100644
--- a/package/gpg/Makefile
+++ b/package/gnupg/Makefile
@@ -4,19 +4,19 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= gnupg
-PKG_VERSION:= 1.4.9
+PKG_VERSION:= 1.4.10
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3537dedea45cc09e8d88d1ef4f774246
+PKG_MD5SUM:= 991faf66d3352ac1452acc393c430b23
PKG_DESCR:= Gnu Privacy Guard
PKG_SECTION:= text
-PKG_DEPENDS:= libreadline
-PKG_URL:= http://www.gnu.org
-PKG_SITES:= ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/ \
- ftp://ftp.gnupg.org/gcrypt/gnupg/
+PKG_DEPENDS:= libreadline libiconv
+PKG_BUILDDEP+= readline libiconv
+PKG_URL:= http://www.gnupg.org
+PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GNUPG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_c_bigendian=no \
@@ -37,9 +37,9 @@ CONFIGURE_ARGS+= --disable-asm \
BUILD_STYLE:= auto
do-install:
- ${INSTALL_DIR} ${IDIR_GPG}/usr/bin/
- ${INSTALL_BIN} ${WRKBUILD}/g10/gpg ${IDIR_GPG}/usr/bin/
+ ${INSTALL_DIR} ${IDIR_GNUPG}/usr/bin/
+ ${INSTALL_BIN} ${WRKBUILD}/g10/gpg ${IDIR_GNUPG}/usr/bin/
# we need root privileges for secure memory (locked pages)
- chmod u+s ${IDIR_GPG}/usr/bin/gpg
+ chmod u+s ${IDIR_GNUPG}/usr/bin/gpg
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gpg/patches/patch-mpi_longlong_h b/package/gnupg/patches/patch-mpi_longlong_h
index 85fc65552..85fc65552 100644
--- a/package/gpg/patches/patch-mpi_longlong_h
+++ b/package/gnupg/patches/patch-mpi_longlong_h
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 0d9a58a14..603e67cc9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -16,10 +16,13 @@ PKG_SITES:= ${MASTER_SITE_GNU:=gnutls/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_DESCR_GNUTLS_UTILS:= GNU TLS utilities
+PKG_DEPENDS_GNUTLS_UTILS:= libgnutls libgnutls-extra
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_GNUTLS_UTILS},${PKG_DESCR_GNUTLS_UTILS},${PKG_SECTION}))
$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -33,11 +36,13 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib
${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgnutls-extra.so.* ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libgnutls-extra.so* \
+ ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so.* ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \
+ ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin
${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
${IDIR_GNUTLS_UTILS}/usr/bin
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index f9228dae1..b7ac0e376 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
PKG_DESCR:= Kerberos 5 server
PKG_SECTION:= net
-PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom-err
+PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err
PKG_BUILDDEP+= openssl ncurses e2fsprogs
ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
PKG_BUILDDEP+= libdb
@@ -40,8 +40,8 @@ PKG_DEPENDS+= libopenldap
endif
$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBHEIMDAL_CLIENT,libheimdal-client,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \
--disable-otp \
@@ -107,34 +107,53 @@ endif
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/heimdal
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
- ${INSTALL_DATA} ./files/krb5.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
- ${INSTALL_DATA} ./files/kdc.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
- ${INSTALL_DATA} ./files/kadmind.acl ${IDIR_HEIMDAL_SERVER}/etc/heimdal
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* \
+ ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* \
+ ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* \
+ ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${INSTALL_DATA} ./files/{krb5.conf,kdc.conf,kadmind.acl} \
+ ${IDIR_HEIMDAL_SERVER}/etc/heimdal
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
# heimdal libs
- ${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
- ${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
endif
- ${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
# heimdal client libs
- ${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
+ ${INSTALL_DIR} ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* \
+ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \
+ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* \
+ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 089197773..6f1c72a18 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
PKG_VERSION:= 1.7
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= net
-PKG_DEPENDS:= krb5-libs libncurses libss libcom-err
+PKG_DEPENDS:= libkrb5 libncurses libss libcom-err
PKG_BUILDDEP+= ncurses e2fsprogs
PKG_URL:= http://web.mit.edu/kerberos
PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIST}/src
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
TCFLAGS+= -I${STAGING_DIR}/usr/include/et
CONFIGURE_STYLE:= gnu
@@ -59,11 +59,11 @@ post-install:
${CP} ${WRKINST}/usr/lib/lib{gssrpc,kadm5clnt,kadm5srv,kdb5}.so* \
${IDIR_KRB5_SERVER}/usr/lib
# krb5-libs
- ${INSTALL_DIR} ${IDIR_KRB5_LIBS}/etc
- ${INSTALL_DIR} ${IDIR_KRB5_LIBS}/usr/lib
- ${INSTALL_DATA} ./files/krb5.conf ${IDIR_KRB5_LIBS}/etc
+ ${INSTALL_DIR} ${IDIR_LIBKRB5}/etc
+ ${INSTALL_DIR} ${IDIR_LIBKRB5}/usr/lib
+ ${INSTALL_DATA} ./files/krb5.conf ${IDIR_LIBKRB5}/etc
${CP} ${WRKINST}/usr/lib/lib{gssapi_krb5,k5crypto,krb5,krb5support}.so* \
- ${IDIR_KRB5_LIBS}/usr/lib
- echo '/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init' > ${IDIR_KRB5_LIBS}/etc/gssapi_mech.conf
+ ${IDIR_LIBKRB5}/usr/lib
+ echo '/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init' > ${IDIR_LIBKRB5}/etc/gssapi_mech.conf
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index 49b89f430..e9794bd1d 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -4,28 +4,29 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libgcrypt
-PKG_VERSION:= 1.4.4
+PKG_VERSION:= 1.4.5
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libgpg-error
-PKG_MD5SUM:= 9e6dcf7fef1ae96b57207a1de91fdaa4
+PKG_MD5SUM:= 325294c12e7b99d82dee3a8bf8c2c28e
PKG_DESCR:= GNU crypto library
PKG_SECTION:= libs
PKG_DEPENDS:= libgpg-error
+PKG_BUILDDEP+= libgpg-error
PKG_URL:= http://directory.fsf.org/project/libgcrypt
PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGCRYPT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-asm \
--with-gpg-error-prefix="${STAGING_DIR}/usr"
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgcrypt.so.* ${IDIR_LIBGCRYPT}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \
+ ${IDIR_LIBGCRYPT}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index ec554b0da..415196934 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -4,29 +4,27 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libgpg-error
-PKG_VERSION:= 1.5
+PKG_VERSION:= 1.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8599b96c911b1df1be24a6ff4ec3c364
+PKG_MD5SUM:= 62c0d09d1e76c5b6da8fff92314c4665
PKG_DESCR:= an helper library for common error codes and descriptions
PKG_SECTION:= libs
PKG_URL:= http://www.gnupg.org
-PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
- http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
- http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \
- http://gnupg.unixmexico.org/ftp/libgpg-error/
+PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGPG_ERROR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_LIBGPG_ERROR}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgpg-error.so.* ${IDIR_LIBGPG_ERROR}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libgpg-error.so* \
+ ${IDIR_LIBGPG_ERROR}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index abccb263a..e6cc3afa5 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -4,28 +4,24 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libtasn1
-PKG_VERSION:= 1.1
+PKG_VERSION:= 2.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 93b43cc5013bda4d8bf64508f1566c54
+PKG_MD5SUM:= 14cc361500d2e768a8a6ec538ce3fecb
PKG_DESCR:= an ASN.1 and DER structures manipulation library
PKG_SECTION:= libs
PKG_URL:= http://www.gnupg.org
-PKG_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
- ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \
- http://www.mirrors.wiretapped.net/security/network-securitygnutls/libtasn1/ \
- ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/libtasn1/ \
- http://josefsson.org/gnutls/releases/libtasn1/
+PKG_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTASN1,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libtasn1.so.* ${IDIR_LIBTASN1}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtasn1/patches/patch-configure b/package/libtasn1/patches/patch-configure
deleted file mode 100644
index 7b8e25cd5..000000000
--- a/package/libtasn1/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id$
---- libtasn1-1.1.orig/configure Fri Aug 31 15:17:55 2007
-+++ libtasn1-1.1/configure Thu Sep 6 15:24:25 2007
-@@ -23445,8 +23445,8 @@ echo "${ECHO_T}$gl_cv_next_unistd_h" >&6
-
-
- # For libtasn1-config.
--LIBTASN1_LIBS="-L${libdir} -ltasn1 $LIBS"
--LIBTASN1_CFLAGS="-I${includedir}"
-+LIBTASN1_LIBS="-ltasn1 $LIBS"
-+LIBTASN1_CFLAGS=
-
-
- ac_config_commands="$ac_config_commands chmod"
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index dc627ffe6..45c95bc79 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -4,17 +4,14 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= maradns
-PKG_VERSION:= 1.3.07.09
+PKG_VERSION:= 1.4.03
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libpthread
-PKG_MD5SUM:= 1d221438fb4d9317263555262b9c652c
+PKG_MD5SUM:= 9e715104234cc9bf01e2afaad27eb787
PKG_DESCR:= small and secure DNS server
PKG_SECTION:= net
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.maradns.org