commit cdcebcfa8395d60cc42e0dcc0a9497b3a633c53c Author: Juergen Daubert <jue@jue.li> Date: Fri Sep 14 14:35:57 2018 +0200 [notify] krb5: update to 1.16.1, cleanup - remove dependency to openldap - move essential libraries from /usr/lib to /lib - move the ksu binary from /usr/bin to /bin - add start-script for the daemons diff --git a/krb5/.footprint b/krb5/.footprint index 08e266346..c768a6d90 100644 --- a/krb5/.footprint +++ b/krb5/.footprint @@ -1,3 +1,15 @@ +drwxr-xr-x root/root bin/ +-rwsr-xr-x root/root bin/ksu +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/rc.d/ +-rwxr-xr-x root/root etc/rc.d/krb5 +drwxr-xr-x root/root lib/ +lrwxrwxrwx root/root lib/libk5crypto.so.3 -> libk5crypto.so.3.1 +-rw-r--r-- root/root lib/libk5crypto.so.3.1 +lrwxrwxrwx root/root lib/libkrb5.so.3 -> libkrb5.so.3.3 +-rw-r--r-- root/root lib/libkrb5.so.3.3 +lrwxrwxrwx root/root lib/libkrb5support.so.0 -> libkrb5support.so.0.1 +-rw-r--r-- root/root lib/libkrb5support.so.0.1 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/gss-client @@ -8,7 +20,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/klist -rwxr-xr-x root/root usr/bin/kpasswd -rwxr-xr-x root/root usr/bin/krb5-config --rwsr-xr-x root/root usr/bin/ksu -rwxr-xr-x root/root usr/bin/kswitch -rwxr-xr-x root/root usr/bin/ktutil -rwxr-xr-x root/root usr/bin/kvno @@ -71,7 +82,6 @@ drwxr-xr-x root/root usr/lib/krb5/plugins/ drwxr-xr-x root/root usr/lib/krb5/plugins/authdata/ drwxr-xr-x root/root usr/lib/krb5/plugins/kdb/ -rw-r--r-- root/root usr/lib/krb5/plugins/kdb/db2.so --rw-r--r-- root/root usr/lib/krb5/plugins/kdb/kldap.so drwxr-xr-x root/root usr/lib/krb5/plugins/libkrb5/ drwxr-xr-x root/root usr/lib/krb5/plugins/preauth/ -rw-r--r-- root/root usr/lib/krb5/plugins/preauth/otp.so @@ -85,9 +95,7 @@ lrwxrwxrwx root/root usr/lib/libgssapi_krb5.so.2 -> libgssapi_krb5.so.2.2 lrwxrwxrwx root/root usr/lib/libgssrpc.so -> libgssrpc.so.4.2 lrwxrwxrwx root/root usr/lib/libgssrpc.so.4 -> libgssrpc.so.4.2 -rw-r--r-- root/root usr/lib/libgssrpc.so.4.2 -lrwxrwxrwx root/root usr/lib/libk5crypto.so -> libk5crypto.so.3.1 -lrwxrwxrwx root/root usr/lib/libk5crypto.so.3 -> libk5crypto.so.3.1 --rw-r--r-- root/root usr/lib/libk5crypto.so.3.1 +lrwxrwxrwx root/root usr/lib/libk5crypto.so -> ../../lib/libk5crypto.so.3.1 lrwxrwxrwx root/root usr/lib/libkadm5clnt.so -> libkadm5clnt_mit.so lrwxrwxrwx root/root usr/lib/libkadm5clnt_mit.so -> libkadm5clnt_mit.so.11.0 lrwxrwxrwx root/root usr/lib/libkadm5clnt_mit.so.11 -> libkadm5clnt_mit.so.11.0 @@ -99,18 +107,11 @@ lrwxrwxrwx root/root usr/lib/libkadm5srv_mit.so.11 -> libkadm5srv_mit.so.11.0 lrwxrwxrwx root/root usr/lib/libkdb5.so -> libkdb5.so.9.0 lrwxrwxrwx root/root usr/lib/libkdb5.so.9 -> libkdb5.so.9.0 -rw-r--r-- root/root usr/lib/libkdb5.so.9.0 -lrwxrwxrwx root/root usr/lib/libkdb_ldap.so -> libkdb_ldap.so.1.0 -lrwxrwxrwx root/root usr/lib/libkdb_ldap.so.1 -> libkdb_ldap.so.1.0 --rw-r--r-- root/root usr/lib/libkdb_ldap.so.1.0 lrwxrwxrwx root/root usr/lib/libkrad.so -> libkrad.so.0.0 lrwxrwxrwx root/root usr/lib/libkrad.so.0 -> libkrad.so.0.0 -rw-r--r-- root/root usr/lib/libkrad.so.0.0 -lrwxrwxrwx root/root usr/lib/libkrb5.so -> libkrb5.so.3.3 -lrwxrwxrwx root/root usr/lib/libkrb5.so.3 -> libkrb5.so.3.3 --rw-r--r-- root/root usr/lib/libkrb5.so.3.3 -lrwxrwxrwx root/root usr/lib/libkrb5support.so -> libkrb5support.so.0.1 -lrwxrwxrwx root/root usr/lib/libkrb5support.so.0 -> libkrb5support.so.0.1 --rw-r--r-- root/root usr/lib/libkrb5support.so.0.1 +lrwxrwxrwx root/root usr/lib/libkrb5.so -> ../../lib/libkrb5.so.3.3 +lrwxrwxrwx root/root usr/lib/libkrb5support.so -> ../../lib/libkrb5support.so.0.1 lrwxrwxrwx root/root usr/lib/libverto.so -> libverto.so.0.0 lrwxrwxrwx root/root usr/lib/libverto.so.0 -> libverto.so.0.0 -rw-r--r-- root/root usr/lib/libverto.so.0.0 @@ -127,7 +128,6 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/gss-server -rwxr-xr-x root/root usr/sbin/kadmin.local -rwxr-xr-x root/root usr/sbin/kadmind --rwxr-xr-x root/root usr/sbin/kdb5_ldap_util -rwxr-xr-x root/root usr/sbin/kdb5_util -rwxr-xr-x root/root usr/sbin/kprop -rwxr-xr-x root/root usr/sbin/kpropd @@ -137,6 +137,39 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/sim_server -rwxr-xr-x root/root usr/sbin/sserver -rwxr-xr-x root/root usr/sbin/uuserver +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/k5srvutil.1.gz +-rw-r--r-- root/root usr/share/man/man1/kadmin.1.gz +-rw-r--r-- root/root usr/share/man/man1/kdestroy.1.gz +-rw-r--r-- root/root usr/share/man/man1/kinit.1.gz +-rw-r--r-- root/root usr/share/man/man1/klist.1.gz +-rw-r--r-- root/root usr/share/man/man1/kpasswd.1.gz +-rw-r--r-- root/root usr/share/man/man1/krb5-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/ksu.1.gz +-rw-r--r-- root/root usr/share/man/man1/kswitch.1.gz +-rw-r--r-- root/root usr/share/man/man1/ktutil.1.gz +-rw-r--r-- root/root usr/share/man/man1/kvno.1.gz +-rw-r--r-- root/root usr/share/man/man1/sclient.1.gz +drwxr-xr-x root/root usr/share/man/man5/ +-rw-r--r-- root/root usr/share/man/man5/.k5identity.5.gz +-rw-r--r-- root/root usr/share/man/man5/.k5login.5.gz +-rw-r--r-- root/root usr/share/man/man5/k5identity.5.gz +-rw-r--r-- root/root usr/share/man/man5/k5login.5.gz +-rw-r--r-- root/root usr/share/man/man5/kadm5.acl.5.gz +-rw-r--r-- root/root usr/share/man/man5/kdc.conf.5.gz +-rw-r--r-- root/root usr/share/man/man5/krb5.conf.5.gz +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/kadmin.local.8.gz +-rw-r--r-- root/root usr/share/man/man8/kadmind.8.gz +-rw-r--r-- root/root usr/share/man/man8/kdb5_ldap_util.8.gz +-rw-r--r-- root/root usr/share/man/man8/kdb5_util.8.gz +-rw-r--r-- root/root usr/share/man/man8/kprop.8.gz +-rw-r--r-- root/root usr/share/man/man8/kpropd.8.gz +-rw-r--r-- root/root usr/share/man/man8/kproplog.8.gz +-rw-r--r-- root/root usr/share/man/man8/krb5kdc.8.gz +-rw-r--r-- root/root usr/share/man/man8/sserver.8.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/krb5kdc/ drwxr-xr-x root/root var/run/ diff --git a/krb5/.signature b/krb5/.signature index 3b39d0f56..be14ac545 100644 --- a/krb5/.signature +++ b/krb5/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YnJe7WjxAmfO/xyBrIXA5iQ0xSgZABp+CBwRMvo8TRWT4mRY1hCvGUNPClYPYa8TC85qOvbYTFnN7Yqmz40Hg4= -SHA256 (Pkgfile) = b901b9618b99c0327ada2b14a3f6cd80d17927001cdb57711c131430dee6d701 -SHA256 (.footprint) = e58ef401503eed6ed201fd918ac762abb7fc020614fc24d4665021f6c2e74f5e -SHA256 (krb5-1.16.tar.gz) = faeb125f83b0fb4cdb2f99f088140631bb47d975982de0956d18c85842969e08 -SHA256 (krb5-config_LDFLAGS.patch) = 815af03db32c3a5006c751d4976b107757aebb2b9098a3e6cbec01f08e0f7215 +RWSE3ohX2g5d/UDM8S1b9BqPXdAnbLas7HTbUk0+7sSdD+v2q72yi4Z7zcIrSiFBWumtbCxNkSUQ1+ZTB8EtLgndWTT6hSAYfwA= +SHA256 (Pkgfile) = e7d8c75b271616b81f3c1ca8770fc2d6aae71335b02aecb4f0ac93e7fa5e03e5 +SHA256 (.footprint) = dd9af196657749ee9315bcb6b8f4f0d9db288637fdcf122e7fd9cedf341cb79a +SHA256 (krb5-1.16.1.tar.gz) = 214ffe394e3ad0c730564074ec44f1da119159d94281bbec541dc29168d21117 +SHA256 (krb5) = e99b414a3c1b788809889c3348ceba7f764ef9185c16c28702bf2d174478e4e1 diff --git a/krb5/Pkgfile b/krb5/Pkgfile index 65ef75b4b..0d7146671 100644 --- a/krb5/Pkgfile +++ b/krb5/Pkgfile @@ -1,37 +1,49 @@ # Description: Network Authentication Protocol -# URL: https://web.mit.edu/kerberos -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: e2fsprogs openldap +# URL: https://web.mit.edu/kerberos +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: e2fsprogs openssl name=krb5 -version=1.16 +version=1.16.1 release=1 -source=(https://kerberos.org/dist/krb5/$version/krb5-$version.tar.gz - $name-config_LDFLAGS.patch) +source=(https://kerberos.org/dist/krb5/1.16/krb5-$version.tar.gz + krb5) build() { - cd $name-$version/src/build-tools - patch -p1 -i $SRC/$name-config_LDFLAGS.patch + cd $name-$version/src - cd $SRC/$name-$version/src - sed -e '/KRB5ROOT=/ s/\/local//' -i util/ac_check_krb5.m4 + ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --enable-shared \ + --disable-rpath \ + --disable-nls \ + --without-tcl \ + --with-system-et \ + --with-system-ss \ + --without-system-verto \ + --enable-dns-for-realm - export CFLAGS="${CFLAGS/-Os/-O2} -I/usr/include/et" + make + make DESTDIR=$PKG install - ./configure --prefix=/usr \ - --localstatedir=/var \ - --enable-shared \ - --disable-rpath \ - --without-tcl \ - --with-ldap \ - --with-system-et \ - --with-system-ss \ - --without-system-verto - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share $PKG/usr/man/cat* $PKG/usr/man5/.* + # move essential libs and the ksu binary to /lib resp. /bin + install -d $PKG/{bin,lib} + + mv $PKG/usr/bin/ksu $PKG/bin + + mv $PKG/usr/lib/libkrb5.so.3* $PKG/lib + mv $PKG/usr/lib/libk5crypto.so.3* $PKG/lib + mv $PKG/usr/lib/libkrb5support.so.0* $PKG/lib + + ln -sf ../../lib/$(readlink $PKG/usr/lib/libkrb5.so) $PKG/usr/lib/libkrb5.so + ln -sf ../../lib/$(readlink $PKG/usr/lib/libk5crypto.so) $PKG/usr/lib/libk5crypto.so + ln -sf ../../lib/$(readlink $PKG/usr/lib/libkrb5support.so) $PKG/usr/lib/libkrb5support.so + + # cleanup + rm -r $PKG/usr/share/{examples,man/cat*} - # comment this if you want kerberized versions of ftp and telnet - rm -rf $PKG/usr/bin/{ftp,telnet} $PKG/usr/man/man1/{ftp,telnet}.1 + # start script + install -D -m 0755 $SRC/krb5 $PKG/etc/rc.d/krb5 } diff --git a/krb5/krb5-config_LDFLAGS.patch b/krb5/krb5-config_LDFLAGS.patch deleted file mode 100644 index 826f721e5..000000000 --- a/krb5/krb5-config_LDFLAGS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/krb5-config.in b/krb5-config.in -index c950b36..fb6520e 100755 ---- a/krb5-config.in -+++ b/krb5-config.in -@@ -31,7 +31,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - includedir=@includedir@ - libdir=@libdir@ --CC_LINK='@CC_LINK@' -+CC_LINK='$(PROG_LIBPATH) $(PROG_RPATH_FLAGS)' - KDB5_DB_LIB=@KDB5_DB_LIB@ - LDFLAGS='@LDFLAGS@' - RPATH_FLAG='@RPATH_FLAG@'