OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Dec-2005 20:59:31
Branch: HEAD Handle: 2005122519593100
Modified files:
openpkg-src/kerberos kerberos.patch kerberos.spec rc.kerberos
Log:
move PID files to run/ subdir; don't install Kerberos 4 to 5 doc;
disable building and installation of network applications (they are
badly maintained and partly unportable); reduce the patching to the
minimum
Summary:
Revision Changes Path
1.12 +30 -194 openpkg-src/kerberos/kerberos.patch
1.65 +7 -21 openpkg-src/kerberos/kerberos.spec
1.15 +2 -2 openpkg-src/kerberos/rc.kerberos
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 31 Jan 2005 19:11:18 -0000
1.11
+++ openpkg-src/kerberos/kerberos.patch 25 Dec 2005 19:59:31 -0000
1.12
@@ -1,197 +1,3 @@
-Index: src/appl/gssftp/configure.in
---- src/appl/gssftp/configure.in.orig 2004-09-23 00:59:44 +0200
-+++ src/appl/gssftp/configure.in 2005-01-31 19:55:02 +0100
-@@ -20,6 +20,7 @@
- AC_REPLACE_FUNCS(getdtablesize)
- AC_CHECK_FUNCS(getcwd getdtablesize getusershell seteuid setreuid setresuid
strerror getenv)
- AC_CHECK_LIB(crypt,crypt) dnl
-+AC_CHECK_TYPE(sig_t,[AC_DEFINE([HAVE_SIG_T])],,[#include <signal.h>]) dnl
- KRB5_AC_LIBUTIL
- dnl
- dnl copied from appl/bsd/configure.in
-Index: src/appl/gssftp/configure
---- src/appl/gssftp/configure.orig 2005-01-27 23:12:30 +0100
-+++ src/appl/gssftp/configure 2005-01-31 19:57:12 +0100
-@@ -8302,6 +8302,71 @@
- fi
-
-
-+ echo "$as_me:$LINENO: checking for sig_t" >&5
-+echo $ECHO_N "checking for sig_t... $ECHO_C" >&6
-+if test "${ac_cv_type_sig_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <signal.h>
-+
-+int
-+main ()
-+{
-+if ((sig_t *) 0)
-+ return 0;
-+if (sizeof (sig_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_sig_t=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_sig_t=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_sig_t" >&5
-+echo "${ECHO_T}$ac_cv_type_sig_t" >&6
-+if test $ac_cv_type_sig_t = yes; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SIG_T 1
-+_ACEOF
-+
-+fi
-+
-+
- echo "$as_me:$LINENO: checking setenv" >&5
- echo $ECHO_N "checking setenv... $ECHO_C" >&6
- if test "${krb5_cv_setenv+set}" = set; then
-Index: src/appl/gssftp/ftp/cmds.c
---- src/appl/gssftp/ftp/cmds.c.orig 2003-06-17 00:37:39.000000000 +0200
-+++ src/appl/gssftp/ftp/cmds.c 2004-04-10 12:36:57.000000000 +0200
-@@ -65,6 +65,10 @@
- #include <errno.h>
- #include <ctype.h>
- #include <time.h>
-+#include <limits.h>
-+#ifndef HAVE_SIG_T
-+typedef void (*sig_t) (int);
-+#endif
-
- #ifdef HAVE_GETCWD
- #define getwd(x) getcwd(x,MAXPATHLEN)
-@@ -101,6 +105,30 @@
- static char *domap (char *);
-
- /*
-+ * pipeprotect: protect against "special" local filenames by prepending
-+ * "./". Special local filenames are "-" and "|..." AND "/...".
-+ */
-+static char *pipeprotect(char *name)
-+{
-+ char *nu;
-+ if (strcmp(name, "-") && *name!='|' && *name!='/') {
-+ return name;
-+ }
-+
-+ /* We're going to leak this memory. XXX. */
-+ nu = malloc(strlen(name)+3);
-+ if (nu==NULL) {
-+ perror("malloc");
-+ code = -1;
-+ return NULL;
-+ }
-+ strcpy(nu, ".");
-+ if (*name != '/') strcat(nu, "/");
-+ strcat(nu, name);
-+ return nu;
-+}
-+
-+/*
- * `Another' gets another argument, and stores the new argc and argv.
- * It reverts to the top level (via main.c's intr()) on EOF/error.
- *
-@@ -844,7 +872,15 @@
-
- if (argc == 2) {
- argc++;
-- argv[2] = argv[1];
-+ /*
-+ * Protect the user from accidentally retrieving special
-+ * local names.
-+ */
-+ argv[2] = pipeprotect(argv[1]);
-+ if (!argv[2]) {
-+ code = -1;
-+ return 0;
-+ }
- loc++;
- }
- if (argc < 2 && !another(&argc, &argv, "remote-file"))
-@@ -1033,16 +1069,14 @@
- }
-
- char *
--remglob(argv,doswitch)
-- char *argv[];
-- int doswitch;
-+remglob(char *argv[], int doswitch)
- {
- #ifdef _WIN32
- char *temp = NULL;
- #else
- char temp[16];
- #endif
-- static char buf[MAXPATHLEN];
-+ static char buf[PATH_MAX];
- static FILE *ftemp = NULL;
- static char **args;
- int oldverbose, oldhash;
-Index: src/appl/gssftp/ftp/ftp.c
---- src/appl/gssftp/ftp/ftp.c.orig 2003-06-17 00:37:40.000000000 +0200
-+++ src/appl/gssftp/ftp/ftp.c 2004-04-10 12:36:57.000000000 +0200
-@@ -99,6 +99,10 @@
- #include <sys/select.h>
- #endif
-
-+#ifndef HAVE_SIG_T
-+typedef void (*sig_t) (int);
-+#endif
-+
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
-Index: src/appl/gssftp/ftp/ftp_var.h
---- src/appl/gssftp/ftp/ftp_var.h.orig 2003-06-17 00:37:40.000000000
+0200
-+++ src/appl/gssftp/ftp/ftp_var.h 2004-04-10 12:36:57.000000000 +0200
-@@ -57,9 +57,7 @@
- typedef void (*sig_t)(int);
- typedef void sigtype;
- #else
--#define sig_t my_sig_t
- #define sigtype krb5_sigtype
--typedef sigtype (*sig_t)();
- #endif
-
- /*
Index: src/lib/krb5/os/hst_realm.c
--- src/lib/krb5/os/hst_realm.c.orig 2002-10-16 00:51:50.000000000 +0200
+++ src/lib/krb5/os/hst_realm.c 2004-04-10 12:36:57.000000000 +0200
@@ -227,3 +33,33 @@
#include <sys/types.h>
#include <sys/file.h>
#include <signal.h>
+Index: src/appl/Makefile.in
+--- src/appl/Makefile.in.orig 2004-03-08 08:20:55 +0100
++++ src/appl/Makefile.in 2005-12-25 20:46:56 +0100
+@@ -3,5 +3,6 @@
+ mydir=.
+ BUILDTOP=$(REL)..
+
+-LOCAL_SUBDIRS= sample simple user_user gss-sample
++LOCAL_SUBDIRS= gss-sample
++MY_SUBDIRS= gss-sample
+
+Index: src/appl/configure
+--- src/appl/configure.orig 2005-11-16 23:47:41 +0100
++++ src/appl/configure 2005-12-25 20:47:39 +0100
+@@ -300,7 +300,6 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subdirs_all="$ac_subdirs_all bsd gssftp telnet"
+
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -6418,7 +6417,6 @@
+
+
+
+-subdirs="$subdirs bsd gssftp telnet"
+
+
+ ac_config_files="$ac_config_files
./Makefile:$krb5_pre_in:./Makefile.in:$krb5_post_in"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 25 Dec 2005 14:29:40 -0000
1.64
+++ openpkg-src/kerberos/kerberos.spec 25 Dec 2005 19:59:31 -0000
1.65
@@ -101,6 +101,7 @@
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/kerberos \
--libdir=%{l_prefix}/lib/kerberos \
+ --enable-dns-for-realm \
--without-tcl \
--without-krb4 \
--enable-static \
@@ -119,29 +120,12 @@
# create additional directories
%{l_shtool} mkdir -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/kerberos/log \
+ $RPM_BUILD_ROOT%{l_prefix}/var/kerberos/run \
$RPM_BUILD_ROOT%{l_prefix}/share/kerberos \
$RPM_BUILD_ROOT%{l_prefix}/etc/kerberos \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl
- # rename and move files
- for i in telnet ftp rcp rlogin rsh uuclient; do
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/$i \
- $RPM_BUILD_ROOT%{l_prefix}/bin/k$i
- if [ -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/$i.1 ]; then
- mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/$i.1 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1/k$i.1
- fi
- done
- for i in ftpd telnetd uuserver; do
- mv $RPM_BUILD_ROOT%{l_prefix}/sbin/$i \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/k$i
- if [ -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/$i.8 ]; then
- mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/$i.8 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8/k$i.8
- fi
- done
-
# strip down installation
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gnats
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/examples
@@ -170,7 +154,8 @@
# install documentation
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- doc/*.ps $RPM_BUILD_ROOT%{l_prefix}/share/kerberos/
+ doc/install-guide.ps doc/admin-guide.ps doc/user-guide.ps \
+ $RPM_BUILD_ROOT%{l_prefix}/share/kerberos/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ -199,7 +184,7 @@
( echo "Before you can use Kerberos you have to choose the"
echo "Kerberos realm (e.g. EXAMPLE.COM) and initialize the"
echo "Kerberos database with the command:"
- echo " \$ $RPM_INSTALL_PREFIX/bin/kerberos-setup <realm>"
+ echo " \$ $RPM_INSTALL_PREFIX/sbin/kerberos-setup <realm>"
) | %{l_rpmtool} msg -b -t notice
fi
# after upgrade, restore status
@@ -212,6 +197,7 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} kerberos stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/kerberos/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/kerberos/log/*.log >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/kerberos/run/*.pid >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/rc.kerberos
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.kerberos
--- openpkg-src/kerberos/rc.kerberos 25 Dec 2005 14:44:18 -0000 1.14
+++ openpkg-src/kerberos/rc.kerberos 25 Dec 2005 19:59:31 -0000 1.15
@@ -31,8 +31,8 @@
kerberos_app_complevel="9"
%common
- krb5kdc_pidfile="@l_prefix@/var/kerberos/krb5kdc.pid"
- kadmind_pidfile="@l_prefix@/var/kerberos/kadmind.pid"
+ krb5kdc_pidfile="@l_prefix@/var/kerberos/run/krb5kdc.pid"
+ kadmind_pidfile="@l_prefix@/var/kerberos/run/kadmind.pid"
krb5kdc_signal () {
[ -f $krb5kdc_pidfile ] && kill -$1 `cat $krb5kdc_pidfile`
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
