diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-09-26 21:57:32 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-09-27 05:53:29 +0700 |
| commit | 7277537e57579d59fa8497ec60cb883d58c0babb (patch) | |
| tree | 60d80e44bbf471474ab18c67084ce3a2d60bfa61 | |
| parent | 024b4628c3cc606f4d1c243d958d23299a3077ff (diff) | |
network/krb5: Avoid overwriting Slackware's package.
Thanks to Mario for reporting.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | network/krb5/krb5-ldflags.patch | 13 | ||||
| -rw-r--r-- | network/krb5/krb5.SlackBuild | 11 |
2 files changed, 22 insertions, 2 deletions
diff --git a/network/krb5/krb5-ldflags.patch b/network/krb5/krb5-ldflags.patch new file mode 100644 index 0000000000000..bdc436e8f2773 --- /dev/null +++ b/network/krb5/krb5-ldflags.patch @@ -0,0 +1,13 @@ +Bug #448778 +--- krb5-1.11/src/build-tools/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 ++++ krb5-1.11/src/build-tools/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 +@@ -217,7 +217,7 @@ + -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ +- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ ++ -e 's#\$(LDFLAGS)##' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)##'` + + diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild index 616d788dea063..031803e98b44d 100644 --- a/network/krb5/krb5.SlackBuild +++ b/network/krb5/krb5.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=krb5 VERSION=${VERSION:-1.14.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -62,10 +62,15 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION/src +cd $PRGNAM-$VERSION +patch -p1 < $CWD/krb5-ldflags.patch +sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4 + +cd src CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +CPPFLAGS+=" -I/usr/include/et" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -74,6 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-dns-for-realm \ --with-ldap \ + --with-system-et \ --build=$ARCH-slackware-linux make @@ -82,6 +88,7 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +rm -rf $PKG/usr/man/cat{1,5,8} find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done |