Author: baggins Date: Fri Mar 30 21:01:17 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - updated TODO - cut changelog - removed obsolete patches - added doc patch for building pdf documentation - fixed -as-needed problems
---- Files affected: SPECS: krb5.spec (1.67 -> 1.68) ---- Diffs: ================================================================ Index: SPECS/krb5.spec diff -u SPECS/krb5.spec:1.67 SPECS/krb5.spec:1.68 --- SPECS/krb5.spec:1.67 Fri Mar 30 16:36:05 2007 +++ SPECS/krb5.spec Fri Mar 30 23:01:12 2007 @@ -3,8 +3,9 @@ # TODO: # - split kdc/kadmind/krb524d/kpropd to separate subpackages # - finish config files and init scripts -# - SECURITY: http://securitytracker.com/alerts/2004/Aug/1011107.html -# - SECURITY: http://securitytracker.com/alerts/2004/Aug/1011106.html +# - check unpackaged files +# - package docs +# - package db2 and openldap plugins # # Conditional build: %bcond_with krb4 # build with Kerberos V4 support @@ -15,7 +16,7 @@ Summary(pl.UTF-8): System Kerberos V5 Name: krb5 Version: 1.6 -Release: 0.2 +Release: 0.1 License: MIT Group: Networking # http://web.mit.edu/kerberos/dist/krb5/1.6/%{name}-%{version}-signed.tar @@ -39,7 +40,6 @@ Source15: propagation Source16: kpropd.init Source17: kadmind.init -Source18: krb5-tex-pdf.sh URL: http://web.mit.edu/kerberos/www/ Patch0: %{name}-telnetd.patch Patch1: %{name}-manpages.patch @@ -53,26 +53,27 @@ Patch8: %{name}-ktany.patch Patch9: %{name}-size.patch Patch10: %{name}-ftp-glob.patch -Patch11: %{name}-check.patch -Patch12: %{name}-norpath.patch -Patch13: %{name}-paths.patch -Patch14: %{name}-autoconf.patch -Patch15: %{name}-api.patch -Patch16: %{name}-brokenrev.patch -Patch17: %{name}-dns.patch -Patch18: %{name}-enospc.patch -Patch19: %{name}-fclose.patch -Patch20: %{name}-fix-sendto_kdc-memset.patch -Patch21: %{name}-gssinit.patch -Patch22: %{name}-io.patch -Patch23: %{name}-kprop-mktemp.patch -Patch24: %{name}-login-lpass.patch -Patch25: %{name}-null.patch -Patch26: %{name}-rcp-markus.patch -Patch27: %{name}-rcp-sendlarge.patch -Patch28: %{name}-reject-bad-transited.patch -Patch29: %{name}-send-pr-tempfile.patch -Patch30: %{name}-telnet-environ.patch +Patch11: %{name}-norpath.patch +Patch12: %{name}-paths.patch +Patch13: %{name}-autoconf.patch +Patch14: %{name}-api.patch +Patch15: %{name}-brokenrev.patch +Patch16: %{name}-dns.patch +Patch17: %{name}-enospc.patch +Patch18: %{name}-fclose.patch +Patch19: %{name}-fix-sendto_kdc-memset.patch +Patch20: %{name}-gssinit.patch +Patch21: %{name}-io.patch +Patch22: %{name}-kprop-mktemp.patch +Patch23: %{name}-login-lpass.patch +Patch24: %{name}-null.patch +Patch25: %{name}-rcp-markus.patch +Patch26: %{name}-rcp-sendlarge.patch +Patch27: %{name}-reject-bad-transited.patch +Patch28: %{name}-send-pr-tempfile.patch +Patch29: %{name}-telnet-environ.patch +Patch30: %{name}-as-needed.patch +Patch31: %{name}-doc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -370,7 +371,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -#patch11 -p1 +%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -378,8 +379,8 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 -%patch19 -p1 -%patch20 -p0 +%patch19 -p0 +%patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 @@ -390,36 +391,33 @@ %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 cp src/krb524/README README.krb524 -sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex -sed -i -e '1c\ -\\documentclass{article}\ -\\usepackage{fixunder}\ -\\usepackage{functions}\ -\\usepackage{fancyheadings}\ -\\usepackage{hyperref}' doc/implement/implement.tex %build cd src # Get LFS support on systems that need it which aren't already 64-bit. %ifarch %{ix86} s390 ppc sparc CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64 -fPIC -I%{_includedir}/et -I%{_includedir}/ncurses" -CPPFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64 -I%{_includedir}/et -I%{_includedir}/ncurses" -CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64 -I%{_includedir}/et -I%{_includedir}/ncurses" +CPPFLAGS="-D_FILE_OFFSET_BITS=64 -I%{_includedir}/et -I%{_includedir}/ncurses" %else CFLAGS="%{rpmcflags} -fPIC -I%{_includedir}/et -I%{_includedir}/ncurses" -CPPFLAGS="%{rpmcflags} -I%{_includedir}/et -I%{_includedir}/ncurses" -CXXFLAGS="%{rpmcxxflags} -I%{_includedir}/et -I%{_includedir}/ncurses" +CPPFLAGS="-I%{_includedir}/et -I%{_includedir}/ncurses" %endif -export CFLAGS CPPFLAGS CXXFLAGS +top=`pwd` +for configurein in `find -name configure.in -type f` ; do + cd `dirname $configurein` + grep -q A._CONFIG_HEADER configure.in && %{__autoheader} -I "$top" + %{__autoconf} -I "$top" + cd $top +done -%{__autoconf} -%{__autoheader} %configure \ - ac_cv_lib_ncurses_setupterm="yes" \ - ac_cv_func_tgetent="yes" \ + CC=%{__cc} \ + CFLAGS="$CFLAGS" \ + CPPFLAGS="$CPPFLAGS" \ %{?with_openldap:OPENLDAP_PLUGIN=yes} \ %{!?with_openldap:OPENLDAP_PLUGIN=""} \ --libexecdir=%{_libdir} \ @@ -438,15 +436,8 @@ %{__make} %{__make} check -$RPM_SOURCE_DIR/krb5-tex-pdf.sh create << EOF -doc/api library krb5 -doc/api libdes -doc/implement implement -doc/kadm5 adb-unit-test -doc/kadm5 api-unit-test -doc/kadm5 api-funcspec -doc/kadm5 api-server-design -EOF +cd ../doc +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -456,24 +447,24 @@ %{__make} -C src install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ -install %{SOURCE6} $RPM_BUILD_ROOT%{_localstatedir}/ -install %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/ -install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/kerberos -install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/kerberos -install %{SOURCE14} $RPM_BUILD_ROOT%{_sbindir}/propagation -install %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/etc/shrc.d - -install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/klogind -install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd -install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/telnetd -install %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/kshd - -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/krb5kdc -install %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/kpropd -install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/kadmind +install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir} +install %{SOURCE7} $RPM_BUILD_ROOT%{_localstatedir} +install %{SOURCE4} $RPM_BUILD_ROOT%{_localstatedir} +install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/kerberos +install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/kerberos +install %{SOURCE15} $RPM_BUILD_ROOT%{_sbindir}/propagation +install %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT/etc/shrc.d + +install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/klogind +install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd +install %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/telnetd +install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/kshd + +install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/krb5kdc +install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/kpropd +install %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/kadmind %if %{with krb4} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/krb524d +install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/krb524d %endif ln -sf %{_datadir}/dict/words $RPM_BUILD_ROOT%{_localstatedir}/kadm5.dict @@ -483,11 +474,6 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/asn.1 -find doc -size 0 -print | xargs rm -f - -# rpath fix -sed "s/^CC_LINK=.*/CC_LINK='\$(CC) \$(PROG_LIBPATH)'/g" src/krb5-config > $RPM_BUILD_ROOT%{_bindir}/krb5-config - %clean rm -rf $RPM_BUILD_ROOT @@ -588,12 +574,12 @@ %attr(755,root,root) %{_sbindir}/kadmind %attr(755,root,root) %{_sbindir}/ktutil %attr(755,root,root) %{_sbindir}/k5srvutil -%attr(755,root,root) %{_sbindir}/v5passwdd %attr(755,root,root) %{_sbindir}/gss-server %attr(755,root,root) %{_sbindir}/sserver %{?with_krb4:%attr(755,root,root) %{_sbindir}/kadmind4} %{?with_krb4:%attr(755,root,root) %{_sbindir}/krb524d} +%{_mandir}/man1/krb5-send-pr.1* %{_mandir}/man8/kadmin.8* %{_mandir}/man8/kadmin.local.8* %{_mandir}/man8/kdb5_util.8* @@ -612,7 +598,6 @@ %attr(755,root,root) %{_bindir}/kdestroy %attr(755,root,root) %{_bindir}/kinit -%attr(755,root,root) %{_bindir}/v5passwd %attr(755,root,root) %{_bindir}/klist %attr(755,root,root) %{_bindir}/gss-client %attr(4755,root,root) %{_bindir}/ksu @@ -622,7 +607,6 @@ %attr(755,root,root) %{_bindir}/sclient %attr(755,root,root) %{_bindir}/kvno -%{_mandir}/man1/v5passwd.1* %{_mandir}/man1/kerberos.1* %{_mandir}/man1/kdestroy.1* %{_mandir}/man1/kinit.1* @@ -699,8 +683,11 @@ %attr(755,root,root) %{_bindir}/krb5-config %attr(755,root,root) %{_libdir}/*.so %{_includedir}/gssapi +%{_includedir}/gssrpc +%{_includedir}/krb5 %{?with_krb4:%{_includedir}/kerberosIV} %{_includedir}/*.h +%{_mandir}/man1/krb5-config.1* %if 0 configure: error: Sorry, static libraries do not work in this release. @@ -715,6 +702,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.68 2007/03/30 21:01:12 baggins +- updated TODO +- cut changelog +- removed obsolete patches +- added doc patch for building pdf documentation +- fixed -as-needed problems + Revision 1.67 2007/03/30 14:36:05 baggins - work in progress - added bugfixes from fedora @@ -832,175 +826,3 @@ - conditionaly builds with krb4 support - fix miscellaneous paths to be more FHS compliant - builds, still requires some work though; not tested - -Revision 1.35 2003/05/28 12:59:23 malekith -- massive attack: source-md5 - -Revision 1.34 2003/05/26 16:25:19 malekith -- massive attack: adding Source-md5 - -Revision 1.33 2003/05/25 05:49:34 misi3k -- massive attack s/pld.org.pl/pld-linux.org/ - -Revision 1.32 2003/03/24 10:34:29 misi3k -- security patch (no 7) CAN-2003-0082 & CAN-2003-0072 -bug: -Buffer overrun and underrun problems exist in Kerberos principal name -handling in unusual cases, such as names with zero components, names -with one empty component, or host-based service principal names with -no host name component. - -Revision 1.31 2003/03/20 20:12:49 misi3k -- security patch (no 6) (CAN-2003-0028) -- rel 4 - -Revision 1.30 2003/01/18 22:53:33 juandon -- removed two lines with define - -Revision 1.29 2002/12/29 21:18:44 qboosh -- umask in scripts, other fixes/cosmetics where needed - -Revision 1.28 2002/12/03 21:34:11 ankry -- cleaning - -Revision 1.27 2002/12/02 11:06:21 ankry -- massive cleaning - -Revision 1.26 2002/11/27 21:10:40 juandon -- new %doc - -Revision 1.25 2002/02/22 23:29:09 kloczek -- removed all Group fields translations (oure rpm now can handle translating - Group field using gettext). - -Revision 1.24 2002/01/18 02:13:34 kloczek -- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" - -Revision 1.23 2001/10/16 21:11:23 marcus -- workaround for old config.sub, BR: automake - -Revision 1.22 2001/10/03 16:43:06 filon -- changed req %{name}-lib to %{name}-devel in static subpkg -- release 3 - -Revision 1.21 2001/09/28 14:57:11 qboosh -- adapterized, added URLs - -Revision 1.20 2001/05/02 21:51:23 qboosh -- adapterized and made spec %debug ready or added using %rpm*flags macros - -Revision 1.19 2001/02/01 16:27:34 kloczek -- Requires for rc-scripts changed to Prereq. - -Revision 1.18 2000/06/09 07:23:14 kloczek -- added using %%{__make} macro. - -Revision 1.17 2000/04/01 11:14:51 zagrodzki -- changed all BuildRoot definitons -- removed all applnkdir defs -- changed some prereqs/requires -- removed duplicate empty lines - -Revision 1.16 2000/03/28 16:54:40 baggins -- translated kloczkish into english - -Revision 1.15 2000/02/02 11:05:20 waszi - -- small fixes in permissions for pam.d or init.d - -Revision 1.14 1999/09/11 13:49:02 misiek -- fixed requires (PR#41) - -Revision 1.13 1999/07/12 23:06:05 kloczek -- added using CVS keywords in %changelog (for automating them). - -* Sat Jun 12 1999 Jan Rękorajski <[EMAIL PROTECTED]> - [1.0.6-2] -- fixed pam_krb5 build - -* Tue May 18 1999 Road Runner <[EMAIL PROTECTED]> - [1.0.6-1] -- update to 1.0.6 -- fixed slave_propagation script, -- added some patches, -- 1st prepare to use on 1.0 PLD Linux System - -- /dev/pts for telnetd most wanted - -- PAM support for klogind && krb5.login needed - -* Thu Feb 18 1999 Road Runner <[EMAIL PROTECTED]> - [1.0.5-5d] -- changed prefix to /usr/athena -- conflicts with other shared libs ;( -- modified %post, %preun & %postun scripts, -- added config for logrotate, -- fixed all config files, -- added %ghost /etc/athena/krb5.keytab && fixed default $KEYTAB_FILE, -- added stripping shared libs, -- compressed documentation, -- fixed Group && Group(pl). - -* Sun Dec 13 1998 Willy The Hacker <[EMAIL PROTECTED]> - [1.0.5-4d] -- splited workstation package into two (clients and daemons), - - by Jolly Roger <[EMAIL PROTECTED]> - -- fixed stupid pam_krb5.so source code bug... - - by Road Runner <[EMAIL PROTECTED]> - -- moved all shared libraries & symlinks into krb5-lib, -- cosmetic changes, -- final build for 1.1 PLD Linux -> I hoppe ;) - -* Tue Oct 20 1998 Road Runner <[EMAIL PROTECTED]> - [1.0.5-3d] -- fixed localstatedir, -- fixed initscript, -- other -- minor changes. - -* Wed Sep 23 1998 Road Runner <[EMAIL PROTECTED]> - [1.0.5-2d] -- fixed pl translation, -- removed ccopts & cppopts from configure, -- restricted files permissions, -- patching ftp & ftpd against empty macros, -- fixed telnet client, -- added $ARCH - to possibility build on i686, -- again fixed shared libraries permissions to 755, -- localstatedir moved to /var/krb5kdc, -- fixed propagation script, -- fixed & moved inetd.conf.secure to %doc, -- removed stripping of shared libraries, -- added more docs, -- added Conflicts: e2fsprogs-devel with devel & static subpackages, -- added Provides: ftp, telnet, rsh in workstation subpackages. - -* Mon Sep 21 1998 Bugs Bunny <[EMAIL PROTECTED]> - [1.0.5-2] -- changed Buildroot to /tmp/%%{name}-%%{version}-root, -- added removing 0 bytes length files, -- added using %%{name} and %%{version} in Source, -- added devel and static subpackages, -- added making some man page as nroff include instead - making sym links to other (this allow compress man pages in future), -- added full %attr description in %files, -- added striping shared libraries, -- fixed passing $RPM_OPT_FLAGS, -- documentation ios now installade in usual place, -- added "Obsoletes: telnet, rsh, ftp" for server (for security) and - worstation packages (for easy replace standard telnet, rsh, ftp client and - servers), -- some %description propagatet from main to subpackages, -- added "%dir /var/krb5kdc" for worstation subpackage, -- many simplifications in %files, %install and %build. - -* Mon Aug 9 1998 Road Runner <[EMAIL PROTECTED]> - [1.0.5-1d] -- translation modified for pl, -- changed permissions of shared libraries to 755, -- removed simple-client and server, -- build without kerberos IV support (we don't need it), - -* Fri Jun 26 1998 Road Runner <[EMAIL PROTECTED]> - [1.0.5-1] -- first try RPM. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/krb5.spec?r1=1.67&r2=1.68&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
