packages/net/xl2tpd: netifd support

[openwrt/svn-archive/archive.git] / net / krb5 / Makefile

diff --git a/net/krb5/Makefile b/net/krb5/Makefile
index b9437891c7773bb55be0607d7e0307e5b2578933..58b5a072e044cbdc7c34f85caf742651cc0ce139 100644 (file)
--- a/net/krb5/Makefile
+++ b/net/krb5/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=krb5
 PKG_VERSION:=1.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=krb5-$(PKG_VERSION)-signed.tar
 PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/$(PKG_VERSION)/
@@ -43,6 +43,7 @@ endef
 
 define Package/krb5-client
        $(call Package/krb5/Default)
+       DEPENDS:=+krb5-libs
        TITLE:=Kerberos 5 Client
 endef
 
@@ -56,6 +57,7 @@ define Build/Prepare
        tar xf "$(DL_DIR)/$(PKG_SOURCE)" -C "$(BUILD_DIR)"
        tar xzf "$(BUILD_DIR)/krb5-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)"
        patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/001-krb5kdc-dir-to-etc.patch"
+       patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/002-MITKRB5-SA-2011-002.patch"
 endef
 
 CONFIGURE_PATH = ./src
@@ -75,11 +77,13 @@ CONFIGURE_ARGS += \
        --disable-ipv6
 
 define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include \
+               $(1)/usr/include/krb5
        $(INSTALL_DIR) $(1)/usr
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/include \
-               $(PKG_INSTALL_DIR)/usr/lib \
-               $(1)/usr/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib \
+               $(1)/usr
+       rm -f $(1)/usr/lib/libcom_err*
 endef
 
 define Package/krb5-libs/install
@@ -104,6 +108,8 @@ define Package/krb5-client/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5-send-pr $(1)/usr/sbin
 endef
 
+# Removed some server-side software to reduce package size. This should be
+# put in a separate package if needed.
 define Package/krb5-server/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/krb5kdc $(1)/etc/init.d/krb5kdc
@@ -111,14 +117,12 @@ define Package/krb5-server/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sclient $(1)/usr/bin
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmin.local $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(1)/usr/sbin
+#      $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kdb5_util $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kdb5_util $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kprop $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kpropd $(1)/usr/sbin
+#      $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kprop $(1)/usr/sbin
+#      $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kpropd $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/krb5kdc $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sim_server $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sserver $(1)/usr/sbin
+#      $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sim_server $(1)/usr/sbin
 endef
 
 $(eval $(call BuildPackage,krb5-libs))