diff --git a/krb5-1.6.1-rpmlintrc b/krb5-1.6.1-rpmlintrc new file mode 100644 index 0000000..e17589b --- /dev/null +++ b/krb5-1.6.1-rpmlintrc @@ -0,0 +1 @@ +addFilter("krb5 devel-file-in-non-devel-package .*/usr/lib/libgssapi_krb5.so") diff --git a/krb5-doc.changes b/krb5-doc.changes index 899b44f..de008e3 100644 --- a/krb5-doc.changes +++ b/krb5-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 13 15:29:42 CEST 2007 - sschober@suse.de + +- removed executable permission from doc file + ------------------------------------------------------------------- Mon Apr 23 11:15:59 CEST 2007 - mc@suse.de diff --git a/krb5-doc.spec b/krb5-doc.spec index db17ff6..2322218 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -13,7 +13,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.6.1 -Release: 13 +Release: 28 %define srcRoot krb5-1.6.1 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT @@ -75,6 +75,7 @@ mv *.html html/ cd .. find . -type f -name '*.ps' -exec gzip -9 {} \; chmod 644 doc/man2ps +chmod 644 doc/krb5-protocol/draft-jaganathan-rc4-hmac-03.txt # cleanup rm -f %{buildroot}/usr/share/man/man1/tmac.doc* rm -f /usr/share/man/man1/tmac.doc* @@ -91,6 +92,8 @@ rm -rf %{buildroot} %doc doc/html %changelog +* Wed Jun 13 2007 - sschober@suse.de +- removed executable permission from doc file * Mon Apr 23 2007 - mc@suse.de - update to final 1.6.1 version - replace te_ams with texlive in BuildRequires diff --git a/krb5-plugins.spec b/krb5-plugins.spec index d543e2d..85ef06e 100644 --- a/krb5-plugins.spec +++ b/krb5-plugins.spec @@ -13,7 +13,7 @@ Name: krb5-plugins Version: 1.6.1 -Release: 5 +Release: 6 BuildRequires: bison krb5-devel ncurses-devel openldap2-devel %define srcRoot krb5-1.6.1 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ diff --git a/krb5.changes b/krb5.changes index ad89c83..8a114f1 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 11 18:04:23 CEST 2007 - sschober@suse.de + +- fixing rpmlint warnings and errors: + * merged logrotate scripts kadmin and krb5kdc into a single file + krb5-server. + * moved heimdal2mit-DumpConvert.pl and simple_convert_krb5conf.pl + from /usr/share/doc/packages/krb5 to /usr/lib/mit/helper. + adapted krb5.spec and README.ConvertHeimdalMIT accordingly. + * added surpression filter for + "devel-file-in-non-devel-package /usr/lib/libgssapi_krb5.so" + (see [#147912]). + * set default runlevel of init scripts in chkconfig line to 3 and + 5 + ------------------------------------------------------------------- Wed May 9 15:30:53 CEST 2007 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index 366424b..af2477a 100644 --- a/krb5.spec +++ b/krb5.spec @@ -12,7 +12,7 @@ Name: krb5 Version: 1.6.1 -Release: 12 +Release: 23 BuildRequires: bison libcom_err ncurses-devel %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -31,6 +31,7 @@ Source1: vendor-files.tar.bz2 Source2: README.Source Source3: spx.c Source4: EncryptWithMasterKey.c +Source5: %{name}-%{version}-rpmlintrc Patch1: krb5-1.5.1-fix-too-few-arguments.dif Patch2: krb5-1.6.1-compile_pie.dif Patch3: krb5-1.4-fix-segfault.dif @@ -66,7 +67,7 @@ Authors: Tom Yu %package client -Summary: MIT Kerberos5 implementation - client programms +Summary: MIT Kerberos5 implementation - client programs Group: Productivity/Networking/Security Provides: heimdal-tools, heimdal-x11 Obsoletes: heimdal-tools, heimdal-x11 @@ -273,8 +274,7 @@ install -m 644 %{vendorFiles}/krb5-telnet.xinetd %{buildroot}%{_sysconfdir}/xine install -m 644 %{vendorFiles}/kshell.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/kshell # install logrotate files mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -install -m 644 %{vendorFiles}/krb5kdc.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5kdc -install -m 644 %{vendorFiles}/kadmind.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/kadmind +install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server find . -type f -name '*.ps' -exec gzip -9 {} \; # create rc* links mkdir -p %{buildroot}/usr/bin/ @@ -285,12 +285,14 @@ ln -sf ../../etc/init.d/krb524d %{buildroot}/usr/bin/rckrb524d # create links for kinit and klist, because of the java ones ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist +# install helper scripts +install -d -m 755 %{buildroot}/usr/lib/mit/helper +install -m 744 %{vendorFiles}/heimdal2mit-DumpConvert.pl %{buildroot}/usr/lib/mit/helper/heimdal2mit-DumpConvert.pl +install -m 744 %{vendorFiles}/simple_convert_krb5conf.pl %{buildroot}/usr/lib/mit/helper/simple_convert_krb5conf.pl # install doc install -d -m 755 %{buildroot}/%{krb5docdir} install -m 644 %{vendorFiles}/README.ConvertHeimdalMIT %{buildroot}/%{krb5docdir}/README.ConvertHeimdalMIT -install -m 744 %{vendorFiles}/heimdal2mit-DumpConvert.pl %{buildroot}/%{krb5docdir}/heimdal2mit-DumpConvert.pl install -m 644 %{_builddir}/%{srcRoot}/README %{buildroot}/%{krb5docdir}/README -install -m 744 %{vendorFiles}/simple_convert_krb5conf.pl %{buildroot}/%{krb5docdir}/simple_convert_krb5conf.pl # cleanup rm -f %{buildroot}/usr/share/man/man1/tmac.doc* rm -f /usr/share/man/man1/tmac.doc* @@ -319,7 +321,7 @@ fi %run_ldconfig if [ -e var/adm/fillup-templates/heimdal-update ] then - %_defaultdocdir/krb5/simple_convert_krb5conf.pl + /usr/lib/mit/helper/simple_convert_krb5conf.pl rm -f /var/adm/fillup-templates/heimdal-update fi if [ ! -e etc/krb5.conf -a -e etc/krb5.conf.rpmnew ] @@ -356,10 +358,11 @@ rm -rf %{buildroot} %dir %{_libdir}/krb5/plugins/kdb %dir %{_libdir}/krb5/plugins/preauth %dir %{_libdir}/krb5/plugins/libkrb5 +%dir /usr/lib/mit/helper # add log directory %attr(0700,root,root) %dir /var/log/krb5 %doc %{krb5docdir}/README -%doc %{krb5docdir}/simple_convert_krb5conf.pl +/usr/lib/mit/helper/simple_convert_krb5conf.pl %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf %attr(0644,root,root) %config /etc/profile.d/krb5* %{_libdir}/lib*.so.* @@ -367,8 +370,7 @@ rm -rf %{buildroot} %files server %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/logrotate.d/krb5kdc -%config(noreplace) %{_sysconfdir}/logrotate.d/kadmind +%config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server %{_sysconfdir}/init.d/kadmind %{_sysconfdir}/init.d/krb5kdc %{_sysconfdir}/init.d/kpropd @@ -376,12 +378,12 @@ rm -rf %{buildroot} %dir %{krb5docdir} %dir /usr/lib/mit %dir /usr/lib/mit/sbin +%dir /usr/lib/mit/helper %dir %{_localstatedir}/lib/kerberos/ %dir %{_localstatedir}/lib/kerberos/krb5kdc %dir %{_libdir}/krb5 %dir %{_libdir}/krb5/plugins %dir %{_libdir}/krb5/plugins/kdb -%doc %{krb5docdir}/heimdal2mit-DumpConvert.pl %doc %{krb5docdir}/README.ConvertHeimdalMIT %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kdc.conf %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl @@ -395,6 +397,7 @@ rm -rf %{buildroot} /usr/lib/mit/sbin/krb5kdc /usr/lib/mit/sbin/krb524d /usr/lib/mit/sbin/EncryptWithMasterKey +/usr/lib/mit/helper/heimdal2mit-DumpConvert.pl %{_libdir}/krb5/plugins/kdb/*.so %{_mandir}/man5/kdc.conf.5* %{_mandir}/man8/kadmind.8* @@ -505,6 +508,18 @@ rm -rf %{buildroot} %{_mandir}/man1/krb5-config.1* %changelog +* Mon Jun 11 2007 - sschober@suse.de +- fixing rpmlint warnings and errors: + * merged logrotate scripts kadmin and krb5kdc into a single file + krb5-server. + * moved heimdal2mit-DumpConvert.pl and simple_convert_krb5conf.pl + from /usr/share/doc/packages/krb5 to /usr/lib/mit/helper. + adapted krb5.spec and README.ConvertHeimdalMIT accordingly. + * added surpression filter for + "devel-file-in-non-devel-package /usr/lib/libgssapi_krb5.so" + (see [#147912]). + * set default runlevel of init scripts in chkconfig line to 3 and + 5 * Wed May 09 2007 - mc@suse.de - fix uninitialized salt length - add extra check for keytab file diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8cecdde..0c99721 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7d974b9c8f4dfedb6f663f4254d9a40557a3ce7fff6b4fb66b1a7bfffa89a58 -size 186375 +oid sha256:6571269211d0d941b7dcf4b72b87d154178529268ef368c4f504e3c251ebb430 +size 186347