Author: baggins Date: Tue Aug 2 12:39:28 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.9.1
- apps have been removed (distributed separately)
- removed no longer used patches and sources
- updated patches
---- Files affected:
packages/krb5:
krb5-autoconf.patch (1.3 -> 1.4) , krb5-enospc.patch (1.2 -> 1.3) ,
krb5-kprop-mktemp.patch (1.2 -> 1.3) , krb5-ksu-access.patch (1.1 -> 1.2) ,
krb5-ksu-path.patch (1.2 -> 1.3) , krb5-manpages.patch (1.1 -> 1.2) ,
krb5-tests.patch (1.13 -> 1.14) , krb5-trunk-kpasswd_tcp.patch (1.1 -> 1.2) ,
krb5.spec (1.152 -> 1.153) , kftpd.inetd (1.1 -> NONE) (REMOVED), kftpd.pamd
(1.1 -> NONE) (REMOVED), klogin.pamd (1.1 -> NONE) (REMOVED), klogind.inetd
(1.5 -> NONE) (REMOVED), krb5-as-needed.patch (1.3 -> NONE) (REMOVED),
krb5-ftp-glob.patch (1.2 -> NONE) (REMOVED), krb5-ftp_fdleak.patch (1.1 ->
NONE) (REMOVED), krb5-ftp_glob_runique.patch (1.1 -> NONE) (REMOVED),
krb5-io.patch (1.2 -> NONE) (REMOVED), krb5-key_exp.patch (1.1 -> NONE)
(REMOVED), krb5-login-lpass.patch (1.1 -> NONE) (REMOVED),
krb5-netkit-rsh.patch (1.1 -> NONE) (REMOVED), krb5-pam.patch (1.3 -> NONE)
(REMOVED), krb5-passive.patch (1.2 -> NONE) (REMOVED), krb5-paths.patch (1.5
-> NONE) (REMOVED), krb5-rcp-markus.patch (1.2 -> NONE) (REMOVED),
krb5-rcp-sendlarge.patch (1.2 -> NONE) (REMOVED), krb5-rlogind-environ.patch
(1.2 -> NONE) (REMOVED), krb5-size.patch (1.1 -> NONE) (REMOVED),
krb5-telnet-environ.patch (1.1 -> NONE) (REMOVED),
krb5-trunk-ftp_mget_case.patch (1.1 -> NONE) (REMOVED), kshell.inetd (1.2 ->
NONE) (REMOVED), kshell.pamd (1.1 -> NONE) (REMOVED), ktelnetd.inetd (1.5 ->
NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/krb5/krb5-autoconf.patch
diff -u packages/krb5/krb5-autoconf.patch:1.3
packages/krb5/krb5-autoconf.patch:1.4
--- packages/krb5/krb5-autoconf.patch:1.3 Fri Mar 30 22:51:33 2007
+++ packages/krb5/krb5-autoconf.patch Tue Aug 2 14:39:22 2011
@@ -2,19 +2,19 @@
--- krb5-1.3.1.ori/src/configure.in 2003-01-11 00:18:53.000000000 +0100
+++ krb5-1.3.1.mod/src/configure.in 2006-11-04 01:25:20.000000000 +0100
@@ -3,10 +3,12 @@
- dnl
- dnl autoconf 2.49 defaults to a /dev/null cache file, which is what we
- dnl do not want for performance reasons.
+ #
+ # autoconf 2.49 defaults to a /dev/null cache file, which is what we
+ # do not want for performance reasons.
-if test "x$cache_file" = "x/dev/null"; then
- cache_file=./config.cache
- AC_CACHE_LOAD
-fi
-+dnl but using that trick makes many problems when there are spaces inside
-+dnl FLAGS (ie rpmflags)
-+dnl if test "x$cache_file" = "x/dev/null"; then
-+dnl cache_file=./config.cache
-+dnl AC_CACHE_LOAD
-+dnl fi
- dnl
++# but using that trick makes many problems when there are spaces inside
++# FLAGS (ie rpmflags)
++# if test "x$cache_file" = "x/dev/null"; then
++# cache_file=./config.cache
++# AC_CACHE_LOAD
++# fi
+
CONFIG_RULES
- dnl
+
================================================================
Index: packages/krb5/krb5-enospc.patch
diff -u packages/krb5/krb5-enospc.patch:1.2 packages/krb5/krb5-enospc.patch:1.3
--- packages/krb5/krb5-enospc.patch:1.2 Fri Jun 5 00:30:57 2009
+++ packages/krb5/krb5-enospc.patch Tue Aug 2 14:39:22 2011
@@ -4,11 +4,11 @@
--- krb5-1.4.3/src/clients/kinit/kinit.c 2006-02-06 13:50:06.000000000
-0500
+++ krb5-1.4.3/src/clients/kinit/kinit.c 2006-02-06 13:49:41.000000000
-0500
@@ -846,8 +847,14 @@
-
- code = krb5_cc_initialize(k5->ctx, k5->cc, k5->me);
- if (code) {
-- com_err(progname, code, "when initializing cache %s",
-- opts->k5_cache_name?opts->k5_cache_name:"");
+ code = krb5_cc_initialize(k5->ctx, k5->cc, opts->canonicalize ?
+ my_creds.client : k5->me);
+ if (code) {
+- com_err(progname, code, "when initializing cache %s",
+- opts->k5_cache_name?opts->k5_cache_name:"");
+ if ((code == KRB5_CC_IO) && (errno != 0)) {
+ com_err(progname, code, "when initializing cache %s: %s",
+ opts->k5_cache_name?opts->k5_cache_name:"",
@@ -17,6 +17,6 @@
+ com_err(progname, code, "when initializing cache %s",
+ opts->k5_cache_name?opts->k5_cache_name:"");
+ }
- goto cleanup;
- }
-
+ goto cleanup;
+ }
+ if (opts->verbose)
================================================================
Index: packages/krb5/krb5-kprop-mktemp.patch
diff -u packages/krb5/krb5-kprop-mktemp.patch:1.2
packages/krb5/krb5-kprop-mktemp.patch:1.3
--- packages/krb5/krb5-kprop-mktemp.patch:1.2 Fri Jun 5 00:30:57 2009
+++ packages/krb5/krb5-kprop-mktemp.patch Tue Aug 2 14:39:22 2011
@@ -1,41 +1,42 @@
Use an in-memory ccache to silence a compiler warning.
--- krb5-1.3.5/src/slave/kprop.c 2004-11-17 12:18:48.000000000 -0500
+++ krb5-1.3.5/src/slave/kprop.c 2004-11-17 13:42:31.926487217 -0500
-@@ -211,9 +211,8 @@
+@@ -211,9 +211,9 @@
void get_tickets(context)
krb5_context context;
{
-- char buf[BUFSIZ];
- krb5_error_code retval;
-- static char tkstring[] = "/tmp/kproptktXXXXXX";
-+ char tkstring[] = "MEMORY:_kproptkt";
- krb5_keytab keytab = NULL;
+- char buf[BUFSIZ], *def_realm;
++ char *def_realm;
+ krb5_error_code retval;
+- static char tkstring[] = "/tmp/kproptktXXXXXX";
++ char tkstring[] = "MEMORY:_kproptkt";
+ krb5_keytab keytab = NULL;
- /*
+ /*
@@ -238,22 +237,19 @@
#endif
- /*
-- * Initialize cache file which we're going to be using
-+ * Initialize an in-memory cache for temporary use
- */
-- (void) mktemp(tkstring);
-- snprintf(buf, sizeof(buf), "FILE:%s", tkstring);
+ /*
+- * Initialize cache file which we're going to be using
++ * Initialize an in-memory cache for temporary use
+ */
+- (void) mktemp(tkstring);
+- snprintf(buf, sizeof(buf), "FILE:%s", tkstring);
-
-- retval = krb5_cc_resolve(context, buf, &ccache);
-+ retval = krb5_cc_resolve(context, tkstring, &ccache);
- if (retval) {
- com_err(progname, retval, "while opening credential cache %s",
-- buf);
-+ tkstring);
- exit(1);
- }
+- retval = krb5_cc_resolve(context, buf, &ccache);
++ retval = krb5_cc_resolve(context, tkstring, &ccache);
+ if (retval) {
+ com_err(progname, retval, "while opening credential cache %s",
+- buf);
++ tkstring);
+ exit(1);
+ }
- retval = krb5_cc_initialize(context, ccache, my_principal);
- if (retval) {
- com_err (progname, retval, "when initializing cache %s",
-- buf);
-+ tkstring);
- exit(1);
- }
+ retval = krb5_cc_initialize(context, ccache, my_principal);
+ if (retval) {
+ com_err (progname, retval, "when initializing cache %s",
+- buf);
++ tkstring);
+ exit(1);
+ }
================================================================
Index: packages/krb5/krb5-ksu-access.patch
diff -u packages/krb5/krb5-ksu-access.patch:1.1
packages/krb5/krb5-ksu-access.patch:1.2
--- packages/krb5/krb5-ksu-access.patch:1.1 Fri Sep 12 18:16:24 2003
+++ packages/krb5/krb5-ksu-access.patch Tue Aug 2 14:39:22 2011
@@ -4,14 +4,14 @@
--- krb5-1.3/src/clients/ksu/ccache.c
+++ krb5-1.3/src/clients/ksu/ccache.c
@@ -77,7 +77,7 @@
- cc_def_name = krb5_cc_get_name(context, cc_def);
- cc_other_name = krb5_cc_get_name(context, *cc_other);
+ cc_def_name = krb5_cc_get_name(context, cc_def);
+ cc_other_name = krb5_cc_get_name(context, *cc_other);
- if ( ! stat(cc_def_name, &st_temp)){
+ if ( ! access(cc_def_name, R_OK) && ! stat(cc_def_name, &st_temp)){
- if((retval = krb5_get_nonexp_tkts(context,cc_def,&cc_def_creds_arr))){
- return retval;
- }
+ if((retval = krb5_get_nonexp_tkts(context,cc_def,&cc_def_creds_arr))){
+ return retval;
+ }
--- krb5-1.3/src/clients/ksu/heuristic.c
+++ krb5-1.3/src/clients/ksu/heuristic.c
@@ -412,7 +412,7 @@
@@ -26,20 +26,20 @@
@@ -572,7 +572,7 @@
cc_source_name = krb5_cc_get_name(context, cc_source);
-
+
- if (! stat(cc_source_name, &st_temp)) {
+ if (! access(cc_source_name, F_OK | R_OK) && ! stat(cc_source_name,
&st_temp)) {
- retval = krb5_cc_get_principal(context, cc_source, &cc_def_princ);
- if (retval)
- return retval;
+ retval = krb5_cc_get_principal(context, cc_source, &cc_def_princ);
+ if (retval)
+ return retval;
--- krb5-1.3/src/clients/ksu/main.c
+++ krb5-1.3/src/clients/ksu/main.c
@@ -263,7 +263,7 @@
- if ( strchr(cc_source_tag, ':')){
- cc_source_tag_tmp = strchr(cc_source_tag, ':') + 1;
-
-- if( stat( cc_source_tag_tmp, &st_temp)){
-+ if( access( cc_source_tag_tmp, F_OK | R_OK) || stat(
cc_source_tag_tmp, &st_temp)){
- com_err (prog_name, errno,
- "while looking for credentials file %s",
- cc_source_tag_tmp);
+ if ( strchr(cc_source_tag, ':')){
+ cc_source_tag_tmp = strchr(cc_source_tag, ':') + 1;
+
+- if( stat( cc_source_tag_tmp, &st_temp)){
++ if( access( cc_source_tag_tmp, F_OK | R_OK) || stat(
cc_source_tag_tmp, &st_temp)){
+ com_err (prog_name, errno,
+ "while looking for credentials file %s",
+ cc_source_tag_tmp);
================================================================
Index: packages/krb5/krb5-ksu-path.patch
diff -u packages/krb5/krb5-ksu-path.patch:1.2
packages/krb5/krb5-ksu-path.patch:1.3
--- packages/krb5/krb5-ksu-path.patch:1.2 Fri Mar 30 15:09:46 2007
+++ packages/krb5/krb5-ksu-path.patch Tue Aug 2 14:39:22 2011
@@ -3,9 +3,8 @@
--- krb5-1.5/src/clients/ksu/Makefile.in 2006-05-24 17:19:23.000000000
-0400
+++ krb5-1.5/src/clients/ksu/Makefile.in 2006-07-05 14:24:41.000000000
-0400
-@@ -2,7 +2,7 @@
- myfulldir=clients/ksu
- mydir=clients/ksu
+@@ -1,6 +1,6 @@
+ mydir=clients$(S)ksu
BUILDTOP=$(REL)..$(S)..
-DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin
/local/bin"'
+DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/sbin
/usr/sbin /bin /usr/bin /usr/X11R6/bin"'
================================================================
Index: packages/krb5/krb5-manpages.patch
diff -u packages/krb5/krb5-manpages.patch:1.1
packages/krb5/krb5-manpages.patch:1.2
--- packages/krb5/krb5-manpages.patch:1.1 Fri Sep 12 18:16:24 2003
+++ packages/krb5/krb5-manpages.patch Tue Aug 2 14:39:22 2011
@@ -1,34 +1,3 @@
---- krb5-1.3/src/appl/bsd/klogind.M
-+++ krb5-1.3/src/appl/bsd/klogind.M
-@@ -27,7 +27,7 @@
- the port indicated in /etc/inetd.conf. A typical /etc/inetd.conf
- configuration line for \fIklogind\fP might be:
-
--klogin stream tcp nowait root /usr/cygnus/sbin/klogind klogind -e5c
-+klogin stream tcp nowait root /usr/sbin/klogind klogind -e5c
-
- When a service request is received, the following protocol is initiated:
-
---- krb5-1.3/src/appl/bsd/kshd.M
-+++ krb5-1.3/src/appl/bsd/kshd.M
-@@ -8,7 +8,7 @@
- .SH NAME
- kshd \- kerberized remote shell server
- .SH SYNOPSIS
--.B /usr/local/sbin/kshd
-+.B /usr/sbin/kshd
- [
- .B \-kr45ec
- ]
-@@ -30,7 +30,7 @@
- on the port indicated in /etc/inetd.conf. A typical /etc/inetd.conf
- configuration line for \fIkrshd\fP might be:
-
--kshell stream tcp nowait root /usr/local/sbin/kshd kshd -5c
-+kshell stream tcp nowait root /usr/sbin/kshd kshd -5c
-
- When a service request is received, the following protocol is initiated:
-
--- krb5-1.3/src/appl/sample/sserver/sserver.M
+++ krb5-1.3/src/appl/sample/sserver/sserver.M
@@ -59,7 +59,7 @@
@@ -40,84 +9,6 @@
.PP
Since \fBsample\fP is normally not a port defined in /etc/services, you will
usually have to add a line to /etc/services which looks like this:
---- krb5-1.3/src/appl/telnet/telnet/telnet.1
-+++ krb5-1.3/src/appl/telnet/telnet/telnet.1
-@@ -8,35 +8,35 @@
- .\" notice, this list of conditions and the following disclaimer.
- .\" 2. Redistributions in binary form must reproduce the above copyright
- .\" notice, this list of conditions and the following disclaimer in the
--.\" documentation and/or other materials provided with the distribution.
--.\" 3. All advertising materials mentioning features or use of this software
--.\" must display the following acknowledgement:
--.\" This product includes software developed by the University of
--.\" California, Berkeley and its contributors.
--.\" 4. Neither the name of the University nor the names of its contributors
--.\" may be used to endorse or promote products derived from this software
--.\" without specific prior written permission.
--.\"
--.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
--.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
--.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
--.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
--.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
--.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
--.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
--.\" SUCH DAMAGE.
--.\"
--.\" @(#)telnet.1 8.4 (Berkeley) 2/3/94
--.\" "
--.TH TELNET 1
--.SH NAME
--telnet \- user interface to the TELNET protocol
--.SH SYNOPSIS
--.B telnet
--[\fB\-8\fP] [\fB\-E\fP] [\fB\-F\fP] [\fB\-K\fP] [\fB\-L\fP] [\fB\-S\fP
-+ .\" documentation and/or other materials provided with the
distribution.
-+ .\" 3. All advertising materials mentioning features or use of this
software
-+ .\" must display the following acknowledgement:
-+ .\" This product includes software developed by the University of
-+ .\" California, Berkeley and its contributors.
-+ .\" 4. Neither the name of the University nor the names of its
contributors
-+ .\" may be used to endorse or promote products derived from this
software
-+ .\" without specific prior written permission.
-+ .\"
-+ .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
AND
-+ .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE
-+ .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE
-+ .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
LIABLE
-+ .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
-+ .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS
-+ .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION)
-+ .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT
-+ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY
-+ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF
-+ .\" SUCH DAMAGE.
-+ .\"
-+ .\" @(#)telnet.1 8.4 (Berkeley) 2/3/94
-+ .\" "
-+ .TH TELNET 1
-+ .SH NAME
-+ telnet \- user interface to the TELNET protocol
-+ .SH SYNOPSIS
-+ .B telnet
-+ [\fB\-8\fP] [\fB\-E\fP] [\fB\-F\fP] [\fB\-K\fP] [\fB\-L\fP] [\fB\-S\fP
- \fItos\fP] [\fB\-X\fP \fIauthtype\fP] [\fB\-a\fP] [\fB\-c\fP]
- [\fB\-d\fP] [\fB\-e\fP \fIescapechar\fP] [\fB\-f\fP] [\fB\-k\fP
- \fIrealm\fP] [\fB\-l\fP \fIuser\fP] [\fB\-n\fP \fItracefile\fP]
---- krb5-1.3/src/appl/telnet/telnetd/telnetd.8
-+++ krb5-1.3/src/appl/telnet/telnetd/telnetd.8
-@@ -37,7 +37,7 @@
- .SM DARPA TELNET
- protocol server
- .SH SYNOPSIS
--.B /usr/libexec/telnetd
-+.B /usr/sbin/telnetd
- [\fB\-a\fP \fIauthmode\fP] [\fB\-B\fP] [\fB\-D\fP] [\fIdebugmode\fP]
- [\fB\-edebug\fP] [\fB\-h\fP] [\fB\-I\fP\fIinitid\fP] [\fB\-l\fP]
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
--- krb5-1.3/src/config-files/kdc.conf.M
+++ krb5-1.3/src/config-files/kdc.conf.M
@@ -235,7 +235,7 @@
================================================================
Index: packages/krb5/krb5-tests.patch
diff -u packages/krb5/krb5-tests.patch:1.13 packages/krb5/krb5-tests.patch:1.14
--- packages/krb5/krb5-tests.patch:1.13 Fri Jun 5 00:30:57 2009
+++ packages/krb5/krb5-tests.patch Tue Aug 2 14:39:22 2011
@@ -34,29 +34,3 @@
DICT=`cd $srcdir/../test && pwd`/dictionary
else
echo 'run.test: no dictionary'
-@@ -404,9 +404,9 @@
- awk 'BEGIN {
- for (i = 1; i <= 10; ++i) {
- printf("p\nkkey1\nD/bin/sh\n");
-- printf("p\nkkey2\nD/bin/csh\n");
-+ printf("p\nkkey2\nD/bin/awk\n");
- if (i % 8 == 0) {
-- printf("c\nkkey2\nD/bin/csh\n");
-+ printf("c\nkkey2\nD/bin/awk\n");
- printf("c\nkkey1\nD/bin/sh\n");
- printf("e\t%d of 10 (comparison)\n", i);
- } else
---- krb5-1.6.3/src/lib/krb5/os/Makefile.in~ 2007-09-18 06:22:24.000000000
+0200
-+++ krb5-1.6.3/src/lib/krb5/os/Makefile.in 2009-06-04 15:29:43.187625635
+0200
-@@ -206,8 +206,10 @@
- -r pgp.good.idea -r no_domain > test.out
- cmp test.out $(srcdir)/ref_std_conf.out
- $(RM) test.out
-+ if test -z "$(SKIP_NET_TESTS)"; then \
- KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
-- $(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc ATHENA.MIT.EDU
-+ $(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc ATHENA.MIT.EDU ;\
-+ fi
-
- #
- # Do some aname-to-lname testing.
================================================================
Index: packages/krb5/krb5-trunk-kpasswd_tcp.patch
diff -u packages/krb5/krb5-trunk-kpasswd_tcp.patch:1.1
packages/krb5/krb5-trunk-kpasswd_tcp.patch:1.2
--- packages/krb5/krb5-trunk-kpasswd_tcp.patch:1.1 Wed Jun 3 16:02:31 2009
+++ packages/krb5/krb5-trunk-kpasswd_tcp.patch Tue Aug 2 14:39:22 2011
@@ -6,14 +6,14 @@
--- src/lib/krb5/os/changepw.c (revision 20199)
+++ src/lib/krb5/os/changepw.c (working copy)
@@ -251,11 +251,22 @@
- NULL,
- NULL
- ))) {
+ NULL,
+ NULL
+ ))) {
-
-- /*
-- * Here we may want to switch to TCP on some errors.
-- * right?
-- */
+- /*
+- * Here we may want to switch to TCP on some errors.
+- * right?
+- */
+ /* if we're not using a stream socket, and it's an error which
+ * might reasonably be specific to a datagram "connection", try
+ * again with a stream socket */
@@ -30,6 +30,6 @@
+ break;
+ }
+ }
- break;
- }
+ break;
+ }
================================================================
Index: packages/krb5/krb5.spec
diff -u packages/krb5/krb5.spec:1.152 packages/krb5/krb5.spec:1.153
--- packages/krb5/krb5.spec:1.152 Mon Aug 1 11:23:31 2011
+++ packages/krb5/krb5.spec Tue Aug 2 14:39:22 2011
@@ -1,6 +1,6 @@
# $Revision$, $Date$
#
-# WARNING!! Please do NOT rebuild it for Th!
+# WARNING!! Please do NOT rebuild it for Th! Its place is in th-obsolete!
# These packages on ftp only confuse people uneducated in Kerberos.
# We use Heimdal implementation in Th. If someone really wants MIT,
# (s)he is on hers/his own.
@@ -16,12 +16,12 @@
Summary: Kerberos V5 System
Summary(pl.UTF-8): System Kerberos V5
Name: krb5
-Version: 1.7
-Release: 4.1
+Version: 1.9.1
+Release: 1
License: MIT
Group: Networking
-Source0:
http://web.mit.edu/kerberos/dist/krb5/1.7/%{name}-%{version}-signed.tar
-# Source0-md5: 9f7b3402b4731a7fa543db193bf1b564
+Source0:
http://web.mit.edu/kerberos/dist/krb5/1.9/%{name}-%{version}-signed.tar
+# Source0-md5: b9f237015fbb83f75d17941588b12b7d
Source2: %{name}kdc.init
Source4: kadm5.acl
Source5: kerberos.logrotate
@@ -30,50 +30,26 @@
Source8: kerberos.sysconfig
Source9: kerberos.sh
Source10: kerberos.csh
-Source11: klogind.inetd
-Source12: kftpd.inetd
-Source13: ktelnetd.inetd
-Source14: kshell.inetd
Source15: propagation
Source16: kpropd.init
Source17: kadmind.init
Source18: kpropd.acl
-Source19: kftpd.pamd
-Source20: klogin.pamd
-Source21: kshell.pamd
Patch0: %{name}-manpages.patch
-Patch1: %{name}-netkit-rsh.patch
-Patch2: %{name}-rlogind-environ.patch
Patch3: %{name}-ksu-access.patch
Patch4: %{name}-ksu-path.patch
-Patch5: %{name}-passive.patch
# http://lite.mit.edu/
Patch6: %{name}-ktany.patch
-Patch7: %{name}-size.patch
-Patch8: %{name}-ftp-glob.patch
-Patch9: %{name}-paths.patch
Patch10: %{name}-autoconf.patch
Patch11: %{name}-brokenrev.patch
Patch12: %{name}-dns.patch
Patch13: %{name}-enospc.patch
-Patch14: %{name}-io.patch
Patch15: %{name}-kprop-mktemp.patch
-Patch16: %{name}-login-lpass.patch
-Patch17: %{name}-rcp-markus.patch
-Patch18: %{name}-rcp-sendlarge.patch
Patch19: %{name}-send-pr-tempfile.patch
-Patch20: %{name}-telnet-environ.patch
-Patch21: %{name}-as-needed.patch
Patch22: %{name}-doc.patch
Patch23: %{name}-tests.patch
Patch24: %{name}-config.patch
-Patch25: %{name}-ftp_fdleak.patch
-Patch26: %{name}-ftp_glob_runique.patch
-Patch27: %{name}-key_exp.patch
-Patch28: %{name}-pam.patch
Patch29: %{name}-selinux-label.patch
Patch200: %{name}-trunk-doublelog.patch
-Patch201: %{name}-trunk-ftp_mget_case.patch
Patch202: %{name}-trunk-kpasswd_tcp.patch
URL: http://web.mit.edu/kerberos/www/
BuildRequires: /bin/csh
@@ -88,7 +64,6 @@
BuildRequires: ncurses-devel
%{?with_openldap:BuildRequires: openldap-devel >= 2.4.6}
BuildRequires: openssl-devel >= 0.9.8
-BuildRequires: pam-devel
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: rpmbuild(macros) >= 1.268
%{?with_tcl:BuildRequires: tcl-devel}
@@ -348,159 +323,6 @@
%description -n openldap-schema-krb5 -l pl.UTF-8
Ten pakiet zawiera schemat kerberosa dla openldap-a.
-%package ftpd
-Summary: The standard UNIX FTP (file transfer protocol) server
-Summary(pl.UTF-8): Serwer FTP
-Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-Requires: rc-inetd >= 0.8.1
-Obsoletes: ftpd
-Conflicts: heimdal-ftpd
-
-%description ftpd
-FTP is the file transfer protocol, which is a widely used Internet
-protocol for transferring files and for archiving files.
-
-%description ftpd -l pl.UTF-8
-FTP jest protokołem transmisji plików szeroko rozpowszechnionym w
-Internecie.
-
-%package kshd
-Summary: Kerberized remote shell server
-Summary(pl.UTF-8): Skerberyzowany serwer zdalnego dostępu
-Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-Requires: rc-inetd >= 0.8.1
-Obsoletes: rshd
-Conflicts: heimdal-rshd
-
-%description kshd
-The kshd package contains kerberized remote shell server which
-provides remote execution facilities with authentication based on the
-Kerberos authentication system.
-
-%description kshd -l pl.UTF-8
-Ten pakiet zawiera skerberyzowaną wersję serwer zdalnego dostępu,
-który umożliwia zdalne wykonywanie poleceń w oparciu o system
-uwierzytelniania Kerberos.
-
-%package telnetd
-Summary: Server for the telnet remote login
-Summary(pl.UTF-8): Serwer protokołu telnet
-Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-Requires: rc-inetd >= 0.8.1
-Obsoletes: telnetd
-Obsoletes: heimdal-telnetd
-
-%description telnetd
-Telnet is a popular protocol for remote logins across the Internet.
-This package provides a telnet daemon which allows remote logins into
-the machine it is running on.
-
-%description telnetd -l pl.UTF-8
-Telnet jest popularnym protokołem zdalnego logowania. Ten pakiet
-zawiera serwer pozwalający na zdalne logowanie się klientów na maszynę
-na której działa.
-
-%package klogind
-Summary: Remote login server
-Summary(pl.UTF-8): Serwer zdalnego logowania
-Group: Networking/Daemons
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-Requires: rc-inetd >= 0.8.1
-Obsoletes: rlogind
-
-%description klogind
-Klogind is the server for the rlogin program. The server is based on
-rlogind but uses Kerberos authentication.
-
-%description klogind -l pl.UTF-8
-Klogind jest serwerem dla programu rlogin. Oparty jest na rlogind ale
-wykorzystuje system uwierzytelniania Kerberos.
-
-%package rlogin
-Summary: rlogin is used when signing onto a system
-Summary(pl.UTF-8): Narzędzie do logowania w systemie
-Group: Networking
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-Provides: rlogin
-
-%description rlogin
-login is used when signing onto a system. It can also be used to
-switch from one user to another at any time (most modern shells have
-support for this feature built into them, however). This package
-contain kerberized version login program.
-
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-autoconf.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-enospc.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-kprop-mktemp.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-ksu-access.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-ksu-path.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-manpages.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-tests.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5-trunk-kpasswd_tcp.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5.spec?r1=1.152&r2=1.153&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
