Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8660 from MikePetullo/krb5

Browse source 
krb5: allow installing without kadmind
This commit is contained in:
Rosen Penev 2019-04-12 01:09:13 -07:00 committed by GitHub
commit b7264c5a1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
net/krb5/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=krb5 PKG_NAME:=krb5
PKG_VERSION:=1.17 PKG_VERSION:=1.17
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@ -50,6 +50,12 @@ define Package/krb5-server
TITLE:=Kerberos 5 Server TITLE:=Kerberos 5 Server
endef endef
define Package/krb5-server-extras
$(call Package/krb5/Default)
DEPENDS:=+krb5-libs +libpthread
TITLE:=Kerberos 5 Admin Server
endef
define Package/krb5-client define Package/krb5-client
$(call Package/krb5/Default) $(call Package/krb5/Default)
DEPENDS:=+krb5-libs DEPENDS:=+krb5-libs
@ -124,22 +130,25 @@ endef
define Package/krb5-server/install define Package/krb5-server/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/krb5kdc $(1)/etc/init.d/krb5kdc $(INSTALL_BIN) ./files/krb5kdc $(1)/etc/init.d/krb5kdc
# $(INSTALL_DIR) $(1)/usr/bin
# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sclient $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmin.local $(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/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/krb5kdc $(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 endef
define Package/krb5-server-extras/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kadmind $(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
endef endef
define Package/krb5-server/postinst define Package/krb5-server/postinst
mkdir -p $${IPKG_INSTROOT}/etc/krb5kdc
touch $${IPKG_INSTROOT}/etc/krb5kdc/kadm5.acl touch $${IPKG_INSTROOT}/etc/krb5kdc/kadm5.acl
endef endef
$(eval $(call BuildPackage,krb5-libs)) $(eval $(call BuildPackage,krb5-libs))
$(eval $(call BuildPackage,krb5-server)) $(eval $(call BuildPackage,krb5-server))
$(eval $(call BuildPackage,krb5-server-extras))
$(eval $(call BuildPackage,krb5-client)) $(eval $(call BuildPackage,krb5-client))

4
net/krb5/files/krb5kdc
View file

@ -10,10 +10,10 @@ start() {
[ -f /etc/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s [ -f /etc/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s
/usr/sbin/krb5kdc /usr/sbin/krb5kdc
/usr/sbin/kadmind [ -x /usr/sbin/kadmind ] && /usr/sbin/kadmind
} }
stop() { stop() {
killall krb5kdc 2> /dev/null killall krb5kdc 2> /dev/null
killall kadmind 2> /dev/null [ -x /usr/sbin/kadmind ] && killall kadmind 2> /dev/null
} }