[arch-commits] CVS update of extra/lib/heimdal (9 files)
Aaron Griffin
aaron at archlinux.org
Wed Nov 28 07:37:43 UTC 2007
Date: Wednesday, November 28, 2007 @ 02:37:43
Author: aaron
Path: /home/cvs-extra/extra/lib/heimdal
Removed: 002_all_heimdal-no_libedit.patch (1.1)
003_all_heimdal-fPIC.patch (1.1) 004_all_heimdal-rxapps.patch (1.2)
006_all_heimdal-suid_fix.patch (1.1)
010_all_heimdal-system-libss.patch (1.2) PKGBUILD (1.21)
heimdal-kdc.rc (1.2) kadmind.rc (1.2) kpasswd.rc (1.3)
Moved to core
------------------------------------+
002_all_heimdal-no_libedit.patch | 10 ---
003_all_heimdal-fPIC.patch | 12 ----
004_all_heimdal-rxapps.patch | 19 -------
006_all_heimdal-suid_fix.patch | 20 -------
010_all_heimdal-system-libss.patch | 40 --------------
PKGBUILD | 94 -----------------------------------
heimdal-kdc.rc | 40 --------------
kadmind.rc | 40 --------------
kpasswd.rc | 40 --------------
9 files changed, 315 deletions(-)
Index: extra/lib/heimdal/002_all_heimdal-no_libedit.patch
diff -u extra/lib/heimdal/002_all_heimdal-no_libedit.patch:1.1 extra/lib/heimdal/002_all_heimdal-no_libedit.patch:removed
--- extra/lib/heimdal/002_all_heimdal-no_libedit.patch:1.1 Mon Jul 11 17:02:43 2005
+++ extra/lib/heimdal/002_all_heimdal-no_libedit.patch Wed Nov 28 02:37:43 2007
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4 2004-09-15 13:24:15.000000000 +0000
-+++ cf/krb-readline.m4 2004-09-17 16:11:39.610756024 +0000
-@@ -6,7 +6,6 @@
- dnl el_init
-
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- AC_TRY_COMPILE([#include <stdio.h>
Index: extra/lib/heimdal/003_all_heimdal-fPIC.patch
diff -u extra/lib/heimdal/003_all_heimdal-fPIC.patch:1.1 extra/lib/heimdal/003_all_heimdal-fPIC.patch:removed
--- extra/lib/heimdal/003_all_heimdal-fPIC.patch:1.1 Mon Jul 11 17:02:43 2005
+++ extra/lib/heimdal/003_all_heimdal-fPIC.patch Wed Nov 28 02:37:43 2007
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am 2004-05-10 09:27:21.442490749 +0000
-+++ lib/editline/Makefile.am 2004-05-10 09:27:38.876209101 +0000
-@@ -47,6 +47,9 @@
-
- EXTRA_DIST = $(man_MANS)
-
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- $(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
Index: extra/lib/heimdal/004_all_heimdal-rxapps.patch
diff -u extra/lib/heimdal/004_all_heimdal-rxapps.patch:1.2 extra/lib/heimdal/004_all_heimdal-rxapps.patch:removed
--- extra/lib/heimdal/004_all_heimdal-rxapps.patch:1.2 Tue Sep 13 07:24:36 2005
+++ extra/lib/heimdal/004_all_heimdal-rxapps.patch Wed Nov 28 02:37:44 2007
@@ -1,19 +0,0 @@
---- appl/kx/rxterm.in 2004-02-21 21:49:23.893934354 +0000
-+++ appl/kx/rxterm.in 2004-02-21 21:49:34.617299076 +0000
-@@ -2,6 +2,6 @@
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
---- appl/kx/rxtelnet.in 2005-06-16 16:29:10.000000000 +0000
-+++ appl/kx/rxtelnet.in 2005-07-11 20:33:10.000000000 +0000
-@@ -2,7 +2,7 @@
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
Index: extra/lib/heimdal/006_all_heimdal-suid_fix.patch
diff -u extra/lib/heimdal/006_all_heimdal-suid_fix.patch:1.1 extra/lib/heimdal/006_all_heimdal-suid_fix.patch:removed
--- extra/lib/heimdal/006_all_heimdal-suid_fix.patch:1.1 Mon Jul 11 17:02:43 2005
+++ extra/lib/heimdal/006_all_heimdal-suid_fix.patch Wed Nov 28 02:37:44 2007
@@ -1,20 +0,0 @@
---- appl/otp/Makefile.am 2004-09-17 22:22:54.046301075 +0000
-+++ appl/otp/Makefile.am 2004-09-17 22:23:15.293145945 +0000
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
-
- man_MANS = otp.1 otpprint.1
-
---- appl/su/Makefile.am 2005-06-16 16:27:46.000000000 +0000
-+++ appl/su/Makefile.am 2005-07-11 20:34:21.000000000 +0000
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
-
- LDADD = $(LIB_kafs) \
Index: extra/lib/heimdal/010_all_heimdal-system-libss.patch
diff -u extra/lib/heimdal/010_all_heimdal-system-libss.patch:1.2 extra/lib/heimdal/010_all_heimdal-system-libss.patch:removed
--- extra/lib/heimdal/010_all_heimdal-system-libss.patch:1.2 Sat Jun 2 09:26:56 2007
+++ extra/lib/heimdal/010_all_heimdal-system-libss.patch Wed Nov 28 02:37:44 2007
@@ -1,40 +0,0 @@
---- lib/sl/Makefile.am~ 2007-06-01 09:48:09.000000000 +0200
-+++ lib/sl/Makefile.am 2007-06-01 09:49:30.000000000 +0200
-@@ -12,36 +12,24 @@
-
- include_HEADERS = sl.h
-
--lib_LTLIBRARIES = libsl.la libss.la
-+lib_LTLIBRARIES = libsl.la
- libsl_la_LDFLAGS = -version-info 2:0:2
--libss_la_LDFLAGS = -version-info 1:5:1
-
- libsl_la_LIBADD = @LIB_readline@
--libss_la_LIBADD = @LIB_readline@ @LIB_com_err@
-
- libsl_la_SOURCES = sl_locl.h sl.c $(ES)
--libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
-
- TESTS = test_sl
- check_PROGRAMS = $(TESTS)
-
- # install these?
-
--bin_PROGRAMS = mk_cmds
- noinst_PROGRAMS = slc
-
--mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
--mk_cmds_LDADD = libsl.la $(LDADD)
--
- slc_SOURCES = slc-gram.y slc-lex.l slc.h
-
--ssincludedir = $(includedir)/ss
--ssinclude_HEADERS = ss.h
--
- CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c strdup.c strupr.c getprogname.c
-
--$(mk_cmds_OBJECTS): parse.h parse.c
--
- LDADD = \
- libsl.la \
- $(LIB_roken) \
Index: extra/lib/heimdal/PKGBUILD
diff -u extra/lib/heimdal/PKGBUILD:1.21 extra/lib/heimdal/PKGBUILD:removed
--- extra/lib/heimdal/PKGBUILD:1.21 Sat Sep 29 06:48:21 2007
+++ extra/lib/heimdal/PKGBUILD Wed Nov 28 02:37:44 2007
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD,v 1.21 2007/09/29 10:48:21 andyrtr Exp $
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-#
-### Attention: build it 2 times - it links against itself! ###
-# ^ better remove old pkg before ;)
-
-pkgname=heimdal
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="Heimdal Kerberos V5 libraries"
-arch=(i686 x86_64)
-url="http://www.pdc.kth.se/heimdal/"
-depends=('db>=4.6' 'openssl' 'e2fsprogs')
-options=('!libtool' '!emptydirs')
-backup=(etc/krb5.conf)
-source=(ftp://ftp.pdc.kth.se/pub/heimdal/src/heimdal-$pkgver.tar.gz \
- 002_all_heimdal-no_libedit.patch \
- 003_all_heimdal-fPIC.patch \
- 004_all_heimdal-rxapps.patch \
- 006_all_heimdal-suid_fix.patch \
- heimdal-kdc.rc \
- kadmind.rc \
- kpasswd.rc)
-md5sums=('498e24f52b4f2e658e31f728a1279769'
- '1199c4a4a38e9c2b2c0a99bd5781767a'
- '3d0262aa218e1611500de735d3581e28'
- '0fe81cb1e33b2a2e60edaf47dfdfe4de'
- '30372b1581e4d49a76688e450fd42443'
- 'e59650992b9541a30dfce727a194f6e0'
- '1f2f86a67bbfddb7af581d35fdca9627'
- 'f8f1eca95b9d3f2b4ebf2417b71b81cf')
-
-build() {
- [ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1
-
- cd ${startdir}/src/heimdal-${pkgver}
- patch -Np0 -i ${startdir}/src/002_all_heimdal-no_libedit.patch || return 1
- patch -Np0 -i ${startdir}/src/003_all_heimdal-fPIC.patch || return 1
- patch -Np0 -i ${startdir}/src/004_all_heimdal-rxapps.patch || return 1
- patch -Np0 -i ${startdir}/src/006_all_heimdal-suid_fix.patch || return 1
-
- libtoolize -f -c || return 1
- aclocal -I cf || return 1
- autoheader || return 1
- automake -a || return 1
- autoconf || return 1
- libtoolize -f -c || return 1
- sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in configure \
- doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
- lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
-
- ./configure --prefix=/usr --enable-shared=yes --without-x \
- --sysconfdir=/etc --mandir=/usr/man \
- --datadir=/var/lib/heimdal \
- --localstatedir=/var/lib/heimdal \
- --with-openssl=/usr \
- --with-readline-lib=/usr/lib \
- --with-readline-include=/usr/include/readline \
- --libexecdir=/usr/sbin --with-berkeley-db \
- --disable-krb4
-
- make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
-
- for i in telnetd ftpd rshd; do
- mv ${startdir}/pkg/usr/man/man8/${i}.8 ${startdir}/pkg/usr/man/man8/k${i}.8
- mv ${startdir}/pkg/usr/sbin/${i} ${startdir}/pkg/usr/sbin/k${i}
- done
-
- for i in rcp rsh telnet ftp su login; do
- if [ -f ${startdir}/pkg/usr/man/man1/${i}.1 ]; then
- mv ${startdir}/pkg/usr/man/man1/${i}.1 ${startdir}/pkg/usr/man/man1/k${i}.1
- fi
- mv ${startdir}/pkg/usr/bin/${i} ${startdir}/pkg/usr/bin/k${i}
- done
- rm -rf ${startdir}/pkg/usr/man/cat{1,3,5,8}
-
- #Arch could be a KDC too
- mkdir -p ${startdir}/pkg/etc/rc.d
- install -m644 ${startdir}/src/heimdal-${pkgver}/krb5.conf ${startdir}/pkg/etc
- for i in heimdal-kdc kadmind kpasswd; do
- install -m755 ${startdir}/src/${i}.rc ${startdir}/pkg/etc/rc.d/${i}
- done
-
- #Remove some conflicts
- rm ${startdir}/pkg/usr/man/man5/ftpusers.5*
- rm ${startdir}/pkg/usr/man/man5/login.access.5*
- # and some more
- rm ${startdir}/pkg/usr/bin/mk_cmds
- rm ${startdir}/pkg/usr/include/ss/ss.h
- rm ${startdir}/pkg/usr/lib/libss.a
- rm ${startdir}/pkg/usr/lib/libss.so
-}
Index: extra/lib/heimdal/heimdal-kdc.rc
diff -u extra/lib/heimdal/heimdal-kdc.rc:1.2 extra/lib/heimdal/heimdal-kdc.rc:removed
--- extra/lib/heimdal/heimdal-kdc.rc:1.2 Sat Dec 31 08:58:38 2005
+++ extra/lib/heimdal/heimdal-kdc.rc Wed Nov 28 02:37:44 2007
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kdc`
-case "$1" in
- start)
- stat_busy "Starting heimdal kdc"
- if [ -z "$PID" ]; then
- /usr/sbin/kdc --detach
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon heimdal-kdc
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping heimdal kdc"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon heimdal-kdc
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
Index: extra/lib/heimdal/kadmind.rc
diff -u extra/lib/heimdal/kadmind.rc:1.2 extra/lib/heimdal/kadmind.rc:removed
--- extra/lib/heimdal/kadmind.rc:1.2 Sat Dec 31 08:58:38 2005
+++ extra/lib/heimdal/kadmind.rc Wed Nov 28 02:37:44 2007
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
- start)
- stat_busy "Starting heimdal admin server"
- if [ -z "$PID" ]; then
- /usr/sbin/kadmind &
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kadmind
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping heimdal admin server"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kadmind
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
Index: extra/lib/heimdal/kpasswd.rc
diff -u extra/lib/heimdal/kpasswd.rc:1.3 extra/lib/heimdal/kpasswd.rc:removed
--- extra/lib/heimdal/kpasswd.rc:1.3 Sun Feb 12 07:26:04 2006
+++ extra/lib/heimdal/kpasswd.rc Wed Nov 28 02:37:44 2007
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpasswdd`
-case "$1" in
- start)
- stat_busy "Starting heimdal kpasswdd"
- if [ -z "$PID" ]; then
- /usr/sbin/kpasswdd &
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kpasswd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping heimdal kpasswdd"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kpasswd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
More information about the arch-commits
mailing list