Permalink
Browse files

Merge remote-tracking branch 'ratler/heimdal'

  • Loading branch information...
2 parents 443fca6 + e6092ba commit 58306e36516e8833f6721676e6b4c7b3321b7e00 @v4hn v4hn committed Sep 15, 2013
Showing with 90 additions and 78 deletions.
  1. +40 −72 crypto/heimdal/BUILD
  2. +14 −5 crypto/heimdal/DETAILS
  3. +36 −1 crypto/heimdal/PRE_BUILD
View
@@ -1,82 +1,50 @@
-(
- export CFLAGS="$CFLAGS -I/usr/include/et" &&
- export CXXFLAGS="$CXXFLAGS -I/usr/include/et" &&
+
+export CFLAGS+=" -I/usr/include/et" &&
+export CXXFLAGS+=" -I/usr/include/et" &&
# When -O1 and --as-needed are set together for the linker you get both
# -Wl,-O1,--as-needed and -Wl,--as-needed. The --as-needed causes heimdal
# to fail linking. Instead of adding 2 bad_flags to we just need a , in front
# of --as-needed to fix it.
- bad_flags ",--as-needed" &&
-
- OPTS+=" --prefix=/usr \
- --without-x \
- --libexecdir=/usr/sbin \
- --datadir=/var/lib/heimdal \
- --localstatedir=/var/lib/heimdal \
- --with-hdbdir=/var/lib/heimdal \
- --sysconfdir=/etc \
- --enable-shared \
- --with-readline=/usr \
- --with-openssl=/usr \
- --disable-otp" &&
- # Migration code, remove symlinks
- REMOVE_KRB="gssapi krb5-types.h krb5.h asn1_err.h krb5_asn1.h \
- krb5_err.h heim_err.h k524_err.h krb5-protos.h" &&
-
- for i in $REMOVE_KRB; do
- [ ! -L $i ] || rm -f /usr/include/${i}
- done &&
-
- if [ -d /usr/include/heimdal ]; then
- rm -rf /usr/include/heimdal
- else
- rm -f /usr/include/heimdal
+bad_flags ",--as-needed" &&
+
+OPTS+=" --prefix=/usr \
+ --without-x \
+ --libexecdir=/usr/sbin \
+ --datadir=/var/lib/heimdal \
+ --localstatedir=/var/lib/heimdal \
+ --with-hdbdir=/var/lib/heimdal \
+ --sysconfdir=/etc \
+ --enable-shared \
+ --with-readline=/usr \
+ --with-openssl=/usr \
+ --disable-otp" &&
+
+mkdir -p $SOURCE_DIRECTORY/__heimdest/ &&
+
+sh autogen.sh &&
+default_config &&
+make &&
+INSTALL_CATPAGES="no" make DESTDIR=$SOURCE_DIRECTORY/__heimdest/ install &&
+
+# Rename files that otherwise would conflict
+for i in rshd telnetd ftpd; do
+ mv -f $SOURCE_DIRECTORY/__heimdest/usr/sbin/{,k}${i} &&
+ mv -f $SOURCE_DIRECTORY/__heimdest/usr/share/man/man8/{,k}${i}.8
+done &&
+
+for i in rsh su telnet ftp login rcp; do
+ if [ -f $SOURCE_DIRECTORY/__heimdest/usr/share/man/man1/${i}.1 ]; then
+ mv -f $SOURCE_DIRECTORY/__heimdest/usr/share/man/man1/{,k}${i}.1
fi &&
+ mv -f $SOURCE_DIRECTORY/__heimdest/usr/bin/{,k}${i}
+done &&
- # DB location changed to a sane place
- if [ -d /var/heimdal ] && [ ! -d /var/lib/heimdal ]; then
- mv -f /var/heimdal /var/lib/heimdal
- fi &&
-
- # Change default datadir (hardcoded)
- sedit "s;var/heimdal;var/lib/heimdal;g" configure doc/vars.texi \
- doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
- kdc/kstash.8 lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 \
- lib/kadm5/check-cracklib.pl lib/kadm5/iprop.8 &&
-
- patch_it $SOURCE2 1 &&
- patch_it $SOURCE3 1 &&
- patch_it $SOURCE4 1 &&
- patch_it $SOURCE5 1 &&
- patch_it $SOURCE6 1 &&
-
- mkdir -p $SOURCE_DIRECTORY/__heimdest/ &&
-
- sh autogen.sh &&
- default_config &&
- make &&
- INSTALL_CATPAGES="no" make DESTDIR=$SOURCE_DIRECTORY/__heimdest/ install &&
-
- # Rename files that otherwise would conflict
- for i in rshd telnetd ftpd; do
- mv $SOURCE_DIRECTORY/__heimdest/usr/sbin/{,k}${i} || exit 1
- mv $SOURCE_DIRECTORY/__heimdest/usr/share/man/man8/{,k}${i}.8 || exit 1
- done &&
-
- for i in rsh su telnet ftp login rcp; do
- if [ -f $SOURCE_DIRECTORY/__heimdest/usr/share/man/man1/${i}.1 ]; then
- mv $SOURCE_DIRECTORY/__heimdest/usr/share/man/man1/{,k}${i}.1 || exit 1
- fi
- mv $SOURCE_DIRECTORY/__heimdest/usr/bin/{,k}${i} || exit 1
- done &&
-
- prepare_install &&
- cp -rf --remove-destination $SOURCE_DIRECTORY/__heimdest/usr / &&
-
- for i in ksu otp; do
- [ ! -f /usr/bin/${i} ] || chmod 4711 /usr/bin/${i}
- done
+prepare_install &&
+cp -rf --remove-destination $SOURCE_DIRECTORY/__heimdest/usr / &&
-) > $C_FIFO 2>&1
+for i in ksu otp; do
+ [ ! -f /usr/bin/${i} ] || chmod 4711 /usr/bin/${i}
+done
View
@@ -1,29 +1,38 @@
MODULE=heimdal
- VERSION=1.5.2
+ VERSION=1.5.3
SOURCE=$MODULE-$VERSION.tar.gz
SOURCE2=$MODULE-1.5.1-lpthreads.patch
SOURCE3=$MODULE-1.3.1-k-prefixes.patch
SOURCE4=$MODULE-1.5.1-suid_fix.patch
SOURCE5=$MODULE-1.5.2-perl5.16-getopts-fix.patch
SOURCE6=$MODULE-1.5.2-no-setpgid-under-systemd.patch
+ SOURCE7=$MODULE-1.5.3-afs_paths.patch
+ SOURCE8=$MODULE-1.5.3-texinfo.patch
+ SOURCE9=$MODULE-1.5.3-enctype_fixes.patch
SOURCE_URL=http://www.h5l.org/dist/src
SOURCE2_URL=$PATCH_URL
SOURCE3_URL=$PATCH_URL
SOURCE4_URL=$PATCH_URL
SOURCE5_URL=$PATCH_URL
SOURCE6_URL=$PATCH_URL
- SOURCE_VFY=sha256:22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec
+ SOURCE7_URL=$PATCH_URL
+ SOURCE8_URL=$PATCH_URL
+ SOURCE9_URL=$PATCH_URL
+ SOURCE_VFY=sha256:aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5
SOURCE2_VFY=sha256:aaa5a7c3a3520ffa288f77d4e29b49a2c5600b6df15f9b825984d8fda04508be
- SOURCE3_VFY=sha1:1a15fbee5de1027babcd151ce23fb5fbeea1c763
+ SOURCE3_VFY=sha256:8be058f550793bd08857a791113ac6af21aab9eaf47e9dea837550d809339962
SOURCE4_VFY=sha256:71f697b2e2f7f20b0489e4636a835e72d779c2dc3046fdd4fe8925585248490c
SOURCE5_VFY=sha256:91b77b2d3277ae4a5da0b354ec96d97e942bd63d2fff42250baf445360ab440b
SOURCE6_VFY=sha256:6527c8a252ed101139b613875e0956aa62db97c54f7d0b806f3bf8cf958b8083
+ SOURCE7_VFY=sha256:f0711334c1173bf6f9be4931fdc597c6189b8269ed38691807fad29ac792df79
+ SOURCE8_VFY=sha256:4010cb2f6d09585aba071b9c9891c77704b62468d9583f82088d020b9538a24d
+ SOURCE9_VFY=sha256:94986c3903d6184fba9d36e97f518a2eb7ab9234d04d7ffcf39bf4204b00a81a
WEB_SITE=http://www.h5l.org/
MAINTAINER=ratler@lunar-linux.org
ENTERED=20041026
- UPDATED=20120616
+ UPDATED=20130913
SHORT="Heimdals kerberos 5 implementation"
-PSAFE=no
+
cat << EOF
Heimdal is a free implementation of Kerberos 5.
EOF
View
@@ -1,5 +1,40 @@
+# This trickery is necessary or heimdal may pickup includes/libs
+# of itself from the system which may cause build issues
if module_installed heimdal ; then
lrm --upgrade heimdal
fi &&
-default_pre_build
+default_pre_build &&
+
+patch_it $SOURCE2 1 &&
+patch_it $SOURCE3 1 &&
+patch_it $SOURCE4 1 &&
+patch_it $SOURCE5 1 &&
+patch_it $SOURCE6 1 &&
+patch_it $SOURCE7 1 &&
+patch_it $SOURCE8 1 &&
+patch_it $SOURCE9 1 &&
+
+# Change default datadir (hardcoded)
+sedit "s;var/heimdal;var/lib/heimdal;g" configure doc/vars.texi \
+ doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
+ kdc/kstash.8 lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 \
+ lib/kadm5/check-cracklib.pl lib/kadm5/iprop.8 &&
+
+# -- Migration code, remove possibly untracked symlinks
+REMOVE_KRB="gssapi krb5-types.h krb5.h asn1_err.h krb5_asn1.h \
+ krb5_err.h heim_err.h k524_err.h krb5-protos.h" &&
+
+for i in $REMOVE_KRB; do
+ [ ! -L $i ] || rm -f /usr/include/${i}
+done &&
+
+if [ -e /usr/include/heimdal ]; then
+ rm -rf /usr/include/heimdal
+fi &&
+
+# DB location changed to a sane place
+if [ -d /var/heimdal ] && [ ! -d /var/lib/heimdal ]; then
+ mv -f /var/heimdal /var/lib/heimdal
+fi
+# -- End migration code

0 comments on commit 58306e3

Please sign in to comment.