summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Depends.mk3
-rw-r--r--package/base-files/extra/etc/functions.sh4
-rw-r--r--package/bigreqsproto/Makefile10
-rw-r--r--package/bluez/Makefile6
-rw-r--r--package/compositeproto/Makefile10
-rw-r--r--package/damageproto/Makefile10
-rw-r--r--package/evieext/Makefile12
-rw-r--r--package/fixesproto/Makefile10
-rw-r--r--package/fontcacheproto/Makefile6
-rw-r--r--package/fontsproto/Makefile10
-rw-r--r--package/grub-bin/Config.in3
-rw-r--r--package/grub-bin/Makefile2
-rw-r--r--package/inputproto/Makefile10
-rw-r--r--package/kbproto/Makefile10
-rw-r--r--package/krb5/Makefile26
-rw-r--r--package/krb5/patches/patch-src_Makefile_in11
-rw-r--r--package/krb5/patches/patch-src_include_osconf_hin (renamed from package/krb5/patches/patch-src_include_stock_osconf_h)28
-rw-r--r--package/krb5/patches/patch-src_lib_kadm5_Makefile_in12
-rw-r--r--package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in12
-rw-r--r--package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in12
-rw-r--r--package/krb5/patches/patch-src_lib_kdb_Makefile_in12
-rw-r--r--package/krb5/patches/patch-src_lib_krb5_Makefile_in12
-rw-r--r--package/krb5/patches/patch-src_lib_rpc_Makefile_in12
-rw-r--r--package/libICE/Makefile10
-rw-r--r--package/libSM/Makefile10
-rw-r--r--package/libX11/Makefile12
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in68
-rw-r--r--package/libXau/Makefile10
-rw-r--r--package/libXaw/Makefile11
-rw-r--r--package/libXdmcp/Makefile10
-rw-r--r--package/libXext/Makefile12
-rw-r--r--package/libXfont/Makefile10
-rw-r--r--package/libXmu/Makefile13
-rw-r--r--package/libXpm/Makefile12
-rw-r--r--package/libXt/Makefile10
-rw-r--r--package/libXt/patches/patch-util_Makefile_in61
-rw-r--r--package/libXv/Makefile10
-rw-r--r--package/libXxf86dga/Makefile10
-rw-r--r--package/libfontenc/Makefile12
-rw-r--r--package/libiconv/Makefile2
-rw-r--r--package/libpciaccess/Makefile10
-rw-r--r--package/libpciaccess/patches/patch-configure_ac16
-rw-r--r--package/libxkbfile/Makefile12
-rw-r--r--package/pixman/Makefile10
-rw-r--r--package/popt/Config.in1
-rw-r--r--package/popt/Makefile3
-rw-r--r--package/popt/patches/patch-Makefile_in11
-rw-r--r--package/popt/patches/patch-po_Makefile_in100
-rw-r--r--package/randrproto/Makefile10
-rw-r--r--package/renderproto/Makefile10
-rw-r--r--package/resourceproto/Makefile10
-rw-r--r--package/samba/Makefile6
-rw-r--r--package/samba/patches/patch-source3_client_mtab_c10
-rw-r--r--package/samba/patches/patch-source3_configure (renamed from package/samba/patches/patch-source_configure)18
-rw-r--r--package/samba/patches/patch-source_client_mtab_c11
-rw-r--r--package/samba/patches/patch-source_registry_reg_perfcount_c21
-rw-r--r--package/scrnsaverproto/Makefile10
-rw-r--r--package/videoproto/Makefile10
-rw-r--r--package/xcmiscproto/Makefile10
-rw-r--r--package/xextproto/Makefile10
-rw-r--r--package/xf86-video-geode/Makefile6
-rw-r--r--package/xf86dgaproto/Makefile10
-rw-r--r--package/xkeyboard-config/Makefile10
-rw-r--r--package/xorg-server/Makefile23
-rw-r--r--package/xproto/Makefile10
-rw-r--r--package/xtrans/Makefile17
66 files changed, 386 insertions, 515 deletions
diff --git a/package/Depends.mk b/package/Depends.mk
index db7aaeb4d..3b4e03f49 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -180,6 +180,7 @@ oprofile-compile: popt-compile
osiris-compile: openssl-compile
palantir-compile: jpeg-compile
pciutils-compile: zlib-compile
+popt-compile: libiconv-compile
ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
portmap-compile: tcp_wrappers-compile
endif
@@ -249,7 +250,7 @@ xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixes
damageproto-compile scrnsaverproto-compile resourceproto-compile \
fontsproto-compile videoproto-compile compositeproto-compile \
evieext-compile libxkbfile-compile libXfont-compile pixman-compile \
- libpciaccess-compile openssl-compile xf86dga-compile
+ libpciaccess-compile openssl-compile
ifeq ($(ADK_PACKAGE_APR_THREADING),y)
apr-compile: libpthread-compile
diff --git a/package/base-files/extra/etc/functions.sh b/package/base-files/extra/etc/functions.sh
index 6563c1d0e..5d76f4843 100644
--- a/package/base-files/extra/etc/functions.sh
+++ b/package/base-files/extra/etc/functions.sh
@@ -64,7 +64,7 @@ get_next_uid() {
uid=1
while grep "^[^:]*:[^:]*:$uid:" $IPKG_INSTROOT/etc/passwd \
>/dev/null 2>&1; do
- let uid++
+ uid=$(($uid+1))
done
echo $uid
}
@@ -73,7 +73,7 @@ get_next_gid() {
gid=1
while grep "^[^:]*:[^:]*:$gid:" $IPKG_INSTROOT/etc/group \
>/dev/null 2>&1; do
- let gid++
+ gid=$(($gid+1))
done
echo $gid
}
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index d6add2e20..b5dad3a5b 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= bigreqsproto
-PKG_VERSION:= 1.0.2
+PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= d43f7faa2aac2f0206ea19f031494af1
+PKG_MD5SUM:= 882d49cc3bb591dbdccdf9e680bd2e4b
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index d0c652c7b..667ccc56e 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
-PKG_VERSION:= 4.56
+PKG_VERSION:= 4.57
PKG_RELEASE:= 1
-PKG_MD5SUM:= 92ea2e86a5489f0d16567920f2ec9b36
+PKG_MD5SUM:= dc29e54f1204ac4215caeeee062b26f6
PKG_DESCR:= bluetooth libraries and applications
PKG_SECTION:= bluetooth
PKG_DEPENDS:= kmod-bluetooth
@@ -36,7 +36,7 @@ BUILD_STYLE:= auto
INSTALL_STYLE:= auto
post-install:
-ifeq ($(ADK_STATIC),n)
+ifneq ($(ADK_STATIC),y)
${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
${CP} ${WRKINST}/usr/lib/libbluetooth.so.* ${IDIR_BLUEZ}/usr/lib/
endif
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index def37e738..b22dc08d3 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= compositeproto
-PKG_VERSION:= 0.4
+PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 33a79f6ba950bc5b41e077c951871bd5
+PKG_MD5SUM:= 6994a209774fe7877fd8e0c9fafe2466
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index 507592593..3b63e93e7 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= damageproto
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= bce4477a6edd774dfca175ea46e1ba76
+PKG_MD5SUM:= 423516fd64e43e8671120056b0d9f597
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/evieext/Makefile b/package/evieext/Makefile
index adc4f0002..de5796c1b 100644
--- a/package/evieext/Makefile
+++ b/package/evieext/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= evieext
-PKG_VERSION:= 1.0.2
+PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= cff7b68b228d255f582cb64879619a44
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_MD5SUM:= 68e61ce53caa495a3ad4085f66010eb8
+PKG_SITES:= ftp://ftp.x.org/pub/individual/proto/
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index b45ed4fe1..4900aee48 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= fixesproto
-PKG_VERSION:= 4.0
+PKG_VERSION:= 4.1.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= ed4af7fbf04a51aca684c259784520f3
+PKG_MD5SUM:= 95806b9b648639d4c3e5b226d10927c0
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile
index 2ab26d96a..34f567d0b 100644
--- a/package/fontcacheproto/Makefile
+++ b/package/fontcacheproto/Makefile
@@ -11,8 +11,8 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile
index c42c8c10e..82c2ebe6a 100644
--- a/package/fontsproto/Makefile
+++ b/package/fontsproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= fontsproto
-PKG_VERSION:= 2.0.2
+PKG_VERSION:= 2.1.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6c1efa12ae50262b45c91e9a120632b7
+PKG_MD5SUM:= 6819fc82585daac68cec17938b659bf0
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/grub-bin/Config.in b/package/grub-bin/Config.in
index bb2d85550..31042cf60 100644
--- a/package/grub-bin/Config.in
+++ b/package/grub-bin/Config.in
@@ -1,8 +1,9 @@
config ADK_PACKAGE_GRUB_BIN
prompt "grub-bin............................. GRUB 2 bootloader (binary)"
tristate
- depends on ADK_LINUX_X86_64_SHUTTLE
+ depends on ADK_LINUX_X86_64_SHUTTLE || ADK_LINUX_X86_ALIX1C
select BUSYBOX_FEATURE_STAT_FORMAT
default y if ADK_LINUX_X86_64_SHUTTLE
+ default y if ADK_LINUX_X86_ALIX1C
help
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 6e0a42817..83ca6bdb9 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= grub-bin
PKG_VERSION:= 1.97
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0b975ea2f0c0cbad6a130d4614fbf399
+PKG_MD5SUM:= db8dff73e119b51529d2a087c9d7d527
PKG_DESCR:= GRUB bootloader
PKG_SECTION:= sys
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 84a321b87..c61a053f4 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= inputproto
-PKG_VERSION:= 1.4.4
+PKG_VERSION:= 2.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 55c67c1f42d70458a3e4d153c8c07cf7
+PKG_MD5SUM:= 13d91739cf70a781f1db24d8d3677574
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index bee278c3a..62da57203 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= kbproto
-PKG_VERSION:= 1.0.3
+PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1efc6a4d97acb3ec3f34c4b2508478dc
+PKG_MD5SUM:= 4deef518a03bc94a7a25902bb7c98dd6
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-CONFIGURE_STYLE= gnu
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+CONFIGURE_STYLE:= gnu
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 38dff7af3..7ffef2877 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -4,17 +4,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
-PKG_VERSION:= 1.6.3
+PKG_VERSION:= 1.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2dc1307686eb1c2bf1ab08ea805dad46
+PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= net
PKG_DEPENDS:= krb5-libs
PKG_URL:= http://web.mit.edu/kerberos
-PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.6/
+PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/
-PKG_DESCR_1:= MIT kerberos libraries
-PKG_SECTION_1:= libs
+PKG_DESCR_LIB:= MIT kerberos libraries
+PKG_SECTION_LIB:= libs
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar
WRKSRC= ${WRKDIST}/src
@@ -22,17 +22,17 @@ 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_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --without-krb4 --disable-static --without-tcl
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ARGS+= --disable-static --without-tcl
CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \
ac_cv_func_regcomp=yes \
ac_cv_printf_positional=yes \
ac_cv_file__etc_environment=no \
ac_cv_file__etc_TIMEZONE=no
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-extract:
(cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz)
@@ -44,11 +44,13 @@ post-install:
${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib
${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb
${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/{ktutil,kdb5_util,krb5kdc,kadmind,kadmin.local,kadmin} \
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/{ktutil,kadmin} \
+ ${IDIR_KRB5_SERVER}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/{kdb5_util,krb5kdc,kadmind,kadmin.local} \
${IDIR_KRB5_SERVER}/usr/sbin
${INSTALL_DATA} ${WRKINST}/usr/lib/krb5/plugins/kdb/db2.so \
${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb
- ${CP} ${WRKINST}/usr/lib/lib{des425,gssrpc,kadm5clnt,kadm5srv,kdb5}.so* \
+ ${CP} ${WRKINST}/usr/lib/lib{gssrpc,kadm5clnt,kadm5srv,kdb5}.so* \
${IDIR_KRB5_SERVER}/usr/lib
# krb5-libs
${INSTALL_DIR} ${IDIR_KRB5_LIBS}/etc
diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in
deleted file mode 100644
index 01533ad39..000000000
--- a/package/krb5/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/Makefile.in 2007-09-18 05:38:17.000000000 +0200
-+++ krb5-1.6.3/src/Makefile.in 2009-01-29 11:50:21.000000000 +0100
-@@ -7,7 +7,6 @@ mydir=.
- SUBDIRS=util include lib @krb524@ kdc kadmin @ldap_plugin_dir@ slave clients \
- plugins/kdb/db2 \
- plugins/preauth/pkinit \
-- appl tests \
- config-files gen-manpages
- BUILDTOP=$(REL)$(C)
- LOCALINCLUDES = -I$(srcdir)
diff --git a/package/krb5/patches/patch-src_include_stock_osconf_h b/package/krb5/patches/patch-src_include_osconf_hin
index b774623fa..834f28292 100644
--- a/package/krb5/patches/patch-src_include_stock_osconf_h
+++ b/package/krb5/patches/patch-src_include_osconf_hin
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/include/stock/osconf.h 2006-05-26 01:37:33.000000000 +0200
-+++ krb5-1.6.3/src/include/stock/osconf.h 2009-02-03 19:13:37.508177540 +0100
-@@ -60,14 +60,14 @@
+--- krb5-1.7.orig/src/include/osconf.hin 2009-01-31 04:57:20.000000000 +0100
++++ krb5-1.7/src/include/osconf.hin 2009-11-01 11:41:43.171362928 +0100
+@@ -61,14 +61,14 @@
#define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname"
#endif /* _WINDOWS */
@@ -21,7 +20,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
#define KDC_PROFILE_ENV "KRB5_KDC_PROFILE"
#if TARGET_OS_MAC
-@@ -96,8 +96,8 @@
+@@ -97,8 +97,8 @@
/*
* Defaults for the KADM5 admin system.
*/
@@ -31,4 +30,21 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+#define DEFAULT_KADM5_ACL_FILE "@SYSCONFDIR/krb5kdc/kadm5.acl"
#define DEFAULT_KADM5_PORT 749 /* assigned by IANA */
- #define MAX_DGRAM_SIZE 4096
+ #define KRB5_DEFAULT_SUPPORTED_ENCTYPES \
+@@ -123,13 +123,13 @@
+ * krb5 slave support follows
+ */
+
+-#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
+-#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
++#define KPROP_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/slave_datatrans"
++#define KPROPD_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/from_master"
+ #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
+ #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
+ #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"
+ #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
+-#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
++#define KPROPD_ACL_FILE "@SYSCONFDIR/krb5kdc/kpropd.acl"
+
+ /*
+ * GSS mechglue
diff --git a/package/krb5/patches/patch-src_lib_kadm5_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_Makefile_in
deleted file mode 100644
index dfcae989b..000000000
--- a/package/krb5/patches/patch-src_lib_kadm5_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kadm5/Makefile.in 2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kadm5/Makefile.in 2009-01-29 12:42:33.000000000 +0100
-@@ -2,7 +2,7 @@ thisconfigdir=../..
- myfulldir=lib/kadm5
- mydir=lib/kadm5
- BUILDTOP=$(REL)..$(S)..
--LOCAL_SUBDIRS = clnt srv unit-test
-+LOCAL_SUBDIRS = clnt srv
- DEFS=
-
- ##DOSBUILDTOP = ..\..
diff --git a/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in
deleted file mode 100644
index 601506c83..000000000
--- a/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kadm5/clnt/Makefile.in 2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kadm5/clnt/Makefile.in 2009-01-30 18:38:15.000000000 +0100
-@@ -15,7 +15,7 @@ SHLIB_EXPDEPS=\
- $(TOPLIBD)/libkrb5$(SHLIBEXT) \
- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- $(COM_ERR_DEPLIB)
--SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-+SHLIB_EXPLIBS=-pthread -lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
- RELDIR=kadm5/clnt
diff --git a/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in
deleted file mode 100644
index d33470c8f..000000000
--- a/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kadm5/srv/Makefile.in 2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kadm5/srv/Makefile.in 2009-01-30 18:31:56.000000000 +0100
-@@ -23,7 +23,7 @@ SHLIB_EXPDEPS=\
- $(TOPLIBD)/libkrb5$(SHLIBEXT) \
- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- $(COM_ERR_DEPLIB)
--SHLIB_EXPLIBS = -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
-+SHLIB_EXPLIBS = -pthread -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
- -lkrb5 -lk5crypto -lcom_err @GEN_LIB@
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
diff --git a/package/krb5/patches/patch-src_lib_kdb_Makefile_in b/package/krb5/patches/patch-src_lib_kdb_Makefile_in
deleted file mode 100644
index 50e184e73..000000000
--- a/package/krb5/patches/patch-src_lib_kdb_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kdb/Makefile.in 2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kdb/Makefile.in 2009-01-30 18:35:24.000000000 +0100
-@@ -21,7 +21,7 @@ RELDIR=kdb
- SHLIB_EXPDEPS = \
- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- $(TOPLIBD)/libkrb5$(SHLIBEXT)
--SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-+SHLIB_EXPLIBS=-pthread -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
-
diff --git a/package/krb5/patches/patch-src_lib_krb5_Makefile_in b/package/krb5/patches/patch-src_lib_krb5_Makefile_in
deleted file mode 100644
index e844e8750..000000000
--- a/