From 77ac4539febf3b71196cb243a3bcd68636111297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 13 Mar 2005 20:52:20 +0000 Subject: [PATCH] 0.68, some default config improvements. --- .cvsignore | 2 +- rpmlint-fedora-config | 3 +- rpmlint-siteperl.patch | 16 -- rpmlint.spec | 547 +---------------------------------------- sources | 2 +- 5 files changed, 14 insertions(+), 556 deletions(-) delete mode 100644 rpmlint-siteperl.patch diff --git a/.cvsignore b/.cvsignore index 967fd48..fc1401a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rpmlint-0.67.tar.bz2 +rpmlint-0.68.tar.bz2 diff --git a/rpmlint-fedora-config b/rpmlint-fedora-config index 378c403..9d5d8a2 100644 --- a/rpmlint-fedora-config +++ b/rpmlint-fedora-config @@ -55,6 +55,7 @@ setOption("ValidLicenses", ( "Freeware", "GPL", "IBM Public License", + "LaTeX Project Public License", "LGPL", "MIT", "MPL", @@ -78,7 +79,7 @@ setOption("ValidShells", ( # Output filters addFilter("W: .* source-or-patch-not-[bg]zipped .*") addFilter("E: .* lib-package-without-%mklibname") -addFilter("E: .* no-dependency (perl|python)-base.*") +addFilter("E: .* no-dependency-on (perl|python)-base.*") addFilter("W: .* (python|perl5)-naming-policy-not-applied.*") addFilter("W: .* invalid-distribution .*") addFilter("W: .* invalid-vendor .*") diff --git a/rpmlint-siteperl.patch b/rpmlint-siteperl.patch deleted file mode 100644 index d2e5b61..0000000 --- a/rpmlint-siteperl.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: FilesCheck.py -=================================================================== -RCS file: /cooker/soft/rpmlint/FilesCheck.py,v -retrieving revision 1.82 -diff -u -r1.82 FilesCheck.py ---- FilesCheck.py 11 Feb 2005 08:32:23 -0000 1.82 -+++ FilesCheck.py 13 Feb 2005 19:04:57 -0000 -@@ -181,7 +181,7 @@ - lib_package_regex=re.compile('^(lib|.+-libs)') - hidden_file_regex=re.compile('/\.[^/]*$') - mispelled_macro_regex=re.compile('%{.*}') --siteperl_perl_regex=re.compile('^/usr/lib/perl5/site_perl/') -+siteperl_perl_regex=re.compile('/site_perl/') - manifest_perl_regex=re.compile('^/usr/share/doc/perl-.*/MANIFEST(\.SKIP)?$'); - shellbang_regex=re.compile('^#!\s*(\S*)') - interpreter_regex=re.compile('^/(usr/)?bin/[^/]+$') diff --git a/rpmlint.spec b/rpmlint.spec index b049d3c..6e8f72a 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,14 +1,13 @@ Name: rpmlint -Version: 0.67 -Release: 1 +Version: 0.68 +Release: 2 Summary: RPM correctness checker Group: Development/Tools License: GPL URL: http://people.mandrakesoft.com/~flepied/projects/rpmlint/ -Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.67.tar.bz2 +Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.68.tar.bz2 Source1: %{name}-fedora-config -Patch0: %{name}-siteperl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -22,7 +21,6 @@ and source packages can be checked. %prep %setup -q -%patch0 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py @@ -76,12 +74,19 @@ fi %{_bindir}/rpm* %dir %{_datadir}/rpmlint %{_datadir}/rpmlint/rpmlint.bash-completion +%exclude %{_datadir}/rpmlint/compile.pyo %dir %{_sysconfdir}/rpmlint %config(noreplace) %{_sysconfdir}/rpmlint/config %ghost %{_sysconfdir}/bash_completion.d/rpmlint %changelog +* Sun Mar 13 2005 Ville Skyttä - 0.68-2 +- 0.68, siteperl patch applied upstream. +- Fix "no-dependency-on" filtering in default config. +- Add LaTeX Project Public License to default config. +- Remove upstream-only %%changelog entries. + * Sun Feb 13 2005 Ville Skyttä - 0:0.67-1 - 0.67. - Patch to catch more site_perl directories. @@ -172,535 +177,3 @@ fi * Sun Mar 30 2003 Ville Skyttä - 0:0.49-0.fdr.0.1.cvs20030330 - First Fedora release, based on upstream spec. - -* Fri Jan 17 2003 Gwenole Beauchesne 0.48-2mdk -- BinariesCheck.py: Add lib64 paths -- FilesCheck.py: Errour out about outside-libdir-files only if it - concerns a library package. This is heuristically determined on the - package name as '^(lib|.+-libs)'. - -* Fri Jan 17 2003 Frederic Lepied 0.48-1mdk - o rpmlint.py: added a way to load an alternative config file (using -f). - o SpecCheck.py: * added lib-package-without-%%mklibname - * don't parse changelog section to find errors and - correct source_dir_regex. - o FilesCheck.py: added outside-libdir-files - o I18NCheck.py: * Added 'en_US' as valid locale name - * Added "lug" (Luganda) language as a valid code for - translations - * Added recognition of some more language codes - (Gnome includes some translations in those languages now) - o various exceptions - -* Thu Aug 8 2002 Frederic Lepied 0.47-1mdk - o BinariesCheck.py: added /usr/lib/bonobo to no binary in /usr/lib exceptions - corrected wrong loop for /usr/lib check - o Config.py: added handling of default values. - o FHSCheck.py: Add lib64 as standard subdir in /usr (that's the /lib part of FHS) - o FilesCheck.py: Add lib64 directories - use default values from Config. - o I18NCheck.py: Added 'zh_HK' recognition - o InitScriptCheck.py: allow to add/del service with rpm-helper scripts. - o MenuCheck.py: add default values from Config. - o PostCheck.py: added perl to dangerous command check trigger scripts too - check rpm-helper prereq. - corrected prereq test - o SpecCheck.py: Also check for \{?_prefix}?/lib references - -* Tue Jun 4 2002 Frederic Lepied 0.46-1mdk - o BinariesCheck.py: added no-binary and only-non-binary-in-usr-lib - -* Mon Jun 3 2002 Gwenole Beauchesne 0.45-1mdk - o SpecCheck.py: - Add configure-without-libdir-spec check - - Add hardcoded-library-path check - -* Wed May 29 2002 Frederic Lepied 0.44-1mdk - o added non-ghost-file check - o added non-root-user-log-file and non-root-group-log-file. - -* Wed May 1 2002 Frederic Lepied 0.43-1mdk - o added no-prereq-on check. - - o check that the package tags are coherent with the file name. - - o added a --policy option. - - o build only one regexp for all exception and correct the broken ones. - -* Fri Mar 8 2002 Frederic Lepied 0.42-2mdk -- corrected rpmdiff location - -* Sun Mar 3 2002 Frederic Lepied 0.42-1mdk - o FilesCheck.py: allow perl and python dependencies to be on -perl-base and python-base. Manage Mandrake perl versionning. - - o I18NCheck.py: Added 'mt' to recognized locales - - o various exceptions. - -* Sat Feb 9 2002 Frederic Lepied 0.41-1mdk - o SpecCheck.py: report missing %clean section. - - o FilesCheck.py: check dependency on the right version of the -interpreter for python and perl modules. - - o various exceptions. - -* Thu Jan 10 2002 Frederic Lepied 0.40-1mdk - - o MenuCheck.py: new check: invalid-menu-icon-type - - o TagsCheck.py: added libsafe.so as an invalid Requires. - - o sync with setup 2.2.0-18mdk (Chmouel). - - o various exceptions. - - o build the package in a way that rpm -V doesn't report warnings. - -* Fri Nov 30 2001 Frederic Lepied 0.39-2mdk - - o BinariesCheck.py: search references to home or tmp in /usr/lib/pkgconfig/ files. - - o FilesCheck.py: .nosearch files are allowed to have a zero length. - - o Config.py: added some exceptions. - -* Sun Nov 25 2001 Frederic Lepied 0.39-1mdk - - o TagsCheck.py: Corrected regexp to check devel provides. - Added the new check invalid-dependency. - - o InitScriptCheck.py: Added incoherent-init-script-name check. - Expand shell variable in incoherent-subsys check. - - o FilesCheck.py: Use list imported from the setup package for users - and groups (from setuplist.py). - - o PostCheck.py: Don't print error about percent if post-script has a - %%. (Chmouel) - Check that RPM_BUILD_ROOT or RPM_BUILD_DIR isn't - used. - - o SpecCheck.py: Check also %_sourcedir. - Check that the BuildRoot tag doesn't contain a - hardcoded path. - - o BinariesCheck.py: Check if .la files contain tmp or home - references. - -* Tue Oct 30 2001 Frederic Lepied 0.38-1mdk - - o BinariesCheck.py: check that major version is present in package -name. - - o FilesCheck.py: check that regular files haven't a zero size. - - o I18NCheck.py: only check binary packages. - - o SpecCheck.py: don't allow space before tag name. - - o TagsCheck.py: * allow space after the release in a changelog entry. - * updated list of licenses from opensource.org and added non - opensource ones. - * report a warning if no url tag is defined. - - o Config.py: various exceptions. - - o SourceCheck.py: correct boolean expression for strange-permission - - -* Tue Oct 16 2001 Frederic Lepied 0.37-1mdk - - o SourceCheck.py: allow 0755 as a valid mode for source. - - o Config.py: various exceptions - - o TagsCheck.py: added invalid-word check in description and summary. - added invalid-buildhost check. - - o FilesCheck.py: added .cvsignore to the list of cvs-internal-file. - - o BinariesCheck.py: check for new style of pic sections. - - o FilesCheck.py: Check if kernel modules are in the kernel package. (Chmouel) - - o PostCheck.py: track command with full path too. - - o FilesCheck.py: added squid group and user. - - o BinariesCheck.py: Warn for man pages without version in library packages. - - o DistributionCheck.py: More explicit path regexp check for info files. (Chmouel) - - -* Fri Sep 28 2001 Frederic Lepied 0.36-1mdk - -- MenuCheck.py: check if a menu file is executable. - -- rpmlint.py: added -n/--noexception option to display all the errors/warnings -without exceptions from Config. - -- TagsCheck.py: added the bugzilla https address as a valid one. - -- PostCheck.py: o ghost-files-without-postun => ghost-files-without-postin - o check if /tmp or /var/tmp is used. - o check if update-menus is called without a menu file. - -- FilesCheck.py: added /etc/logrotate.d entry check. - -- Config.py: various exceptions - -* Tue Aug 21 2001 Frederic Lepied 0.35-1mdk - -- BinariesCheck.py: o Make libraries not linked against libc errors - and not warnings. (Bill Nottingham) - - o libc doesn't need to be linked against libc, - and the dynamic linker doesn't need dependeny information. (Bill Nottingham) - - o Fix some of the library checks to be more correct. (Bill - Nottingham) - -- TagsCheck.py: added a check on obsoleted packages not provided. - -- FilesCheck.py: check non readable files. - -- PostCheck.py: check ~/ instead of ~ to allow awk scripts not to - give false reports. - -- MenuCheck.py: o added a check for / in menu titles. - - o Add missing menu entries. (FredC) - -- I18NCheck.py: Added 'bs' as a valid language code name. (Pablo) - -- Config.py: added a few exceptions. - -* Sun Jul 15 2001 Frederic Lepied 0.34-1mdk -- added missing descriptions. -- added -a option to check all the installed packages. -- TagsCheck.py: handle the libbzip2_1-devel case. - -* Fri Jul 6 2001 Christian Belisle 0.33-2mdk -- Added descriptions for the -i option. - -* Mon Jul 2 2001 Frederic Lepied 0.33-1mdk -- more descriptions from Christian Belisle. - -- BinariesCheck.py: new check for files which can cause upgrade - problems in the library packages. - -- TagsCheck.py: try to check alpha/beta/pre version improper use. - -- Filter.py: print description only if they aren't empty. - -- SpecCheck.py: added a check for obsolete tags. - -- FilesCheck.py: added named user and group to the exception list. - -* Mon Jun 18 2001 Christian Belisle 0.32-2mdk -- Added descriptions for the -i option. - -* Wed Jun 13 2001 Frederic Lepied 0.32-1mdk -- rpmlint.py: o If the file given on the command line doesn't exist, - try to use the name as an installed package to check. - o new -i option to give explanation on the errors/warnings (not too much - descriptions have been added ;-) - -- MenuCheck.py: added new Office sub menus. - -- FilesCheck.py: o added /usr/X11R6/man subdirs to the list of - STANDARD_DIRS. - o warn for .so file only if they are in a lib dir. - o warn for source files in a non devel package only if they are not - doc files. - -- TagsCheck.py: corrected description-line-too-long check. - -- FilesCheck.py: add the rpm user and group per request of Jeff - Johnson for the future version of rpm. - -* Fri May 18 2001 Frederic Lepied 0.31-1mdk -- PostCheck.py: check that a script isn't only one command. - check postin and prein instead of postun and preun - for ghost files creation. - -- MenuCheck.py: don't check NO_XALF in menu command. - -- FilesCheck.py: Add rpcuser. - -- Config.py: Expections for ldconfig, initscripts, netkit-base and iputils. - -- TagsCheck.py: check length of summary and description lines. - -* Fri Feb 16 2001 Frederic Lepied 0.30-1mdk - -- InitScriptCheck.py: check if runlevels are set - -- MenuCheck.py: added support to check launchers. - -- I18NCheck.py: check subdirs of /sur/share/man. - -- PostCheck.py: check that the postun creates the ghost files - added install to dangerous commands - -- LSBCheck.py: first version - -- TagsCheck.py: changed Window Maker to WindowMaker - Add https as valid url. - Used list of licenses from www.opensource.org/licenses - Check the full license before splitting in it - multiple parts. - - -* Thu Dec 7 2000 Frederic Lepied 0.29-1mdk - -- PostCheck.py: Add /sbin/sash as VALID_SHELLS. - -- Config.py: added exceptions for dev. - -- FilesCheck.py: check dangling-symlink in the file index too to -avoid missing special files that aren't created when extracted as a -user. - -- FilesCheck.py: added a generic way to avoid dangling-symlink -warnings. - -- TagsCheck.py: for devel packages, check dependency on lib package -only when a .so file is present. - -- Config.py: add some execptions for pam (0750 dir for /etc/default -is normal as weel to have gpasswd and chage as suid). - -- Config.py: Don't check info-file-with-install-info for bash since -it's by default in the dir file. - -* Fri Nov 24 2000 Frederic Lepied 0.28-1mdk -- TagsCheck.py: o check -devel package naming scheme only on binary - packages. - o report a warning if a -devel package comes with no - major in its name. - o added python licence and public domain. - o check syntax of url tag. - -- SourceCheck.py: only check compression on tar or diff files. - -- Config.py: various exceptions added. - -- BinariesCheck.py: o report the file location on objdump errors. - o new error: executable in library package. - -- I18NCheck.py: fuzzy check on packages without dependency on -locales - -- FilesCheck.py: check if a package provides sources. - -- PostCheck.py: force a separator before dangerous command. - - -* Mon Nov 13 2000 Frederic Lepied 0.27-1mdk -- FilesCheck.py: don't warn if a games is setgid games. -- README: RpmGamesGroup added to the list of available options. -- Config.py: added exception for xman. -- BinariesCheck.py: check ldconfig symlinks. -- TagsCheck.py: don't check no-version-in-changelog for source rpm. - -* Fri Nov 10 2000 Frederic Lepied 0.26-1mdk - -- Config.py: added various exceptions. - -- TagsCheck.py: o allow multiple licenses. - o don't report anymore the package-provides-itself warning because - it's the default in rpm 4. - o try to not report incoherent-version-in-changelog for sub-packages. - -- MenuCheck.py: correct the non-transparent-xpm check. - -- FilesCheck.py: don't report buggy length-symlink anymore. - -* Thu Oct 12 2000 Frederic Lepied 0.25-1mdk - -- Config.py: added exception for sympa, rpm and bcast. - -- TagsCheck.py: o check that devel package depends on the base - package with the same version. - o check that summary begins with a - -- PostCheck.py: o check dangerous commands. - ocheck reference to ~ or $HOME. - -- MenuCheck.py: o check that titles and longtitles begin by a capital - letter. - o check that no version is included in title and longtitle. - o /lib/cpp errors to /dev/null for new cpp. - -- FilesCheck.py: check package owning system dirs. - -- SpecCheck.py: o new check. - o check name of spec file. - o check use of $RPM_SOURCE_DIR. - o warn if a patch is not applied. - -* Mon Oct 2 2000 Frederic Lepied 0.24-1mdk -- FilesCheck.py: added apache and postgres to standard groups. -- TagsCheck.py: spell check a la Debian. - -* Fri Sep 29 2000 Frederic Lepied 0.23-1mdk -- MenuCheck.py: added Applications/Accessibility. - check that menu files are readable by everyone. -- Config.py: removed exception for /home. - added exceptions for vixie-cron. -- FilesCheck.py: check cvs internal files. - -* Tue Sep 12 2000 Frederic Lepied 0.22-1mdk -- PostCheck.py: print a warning on empty script. -- FilesCheck.py: added postgres and apache to default users. -- TagsCheck.py: added bugs@linux-mandrake.com as a valid packager address. -- I18NCheck.py: check *.mo for file-not-in-%lang, not only in /usr/share/locale -- TagsCheck.py, MenuCheck.py: replaced Networking/ICQ group with Networking/Instant messaging. - -* Thu Aug 31 2000 Frederic Lepied 0.21-1mdk -- TagsCheck.py: check packager field compliance to a regexp. -- Config.py: imported default exceptions. -- TagsCheck.py: added Apache License, PHP Licence and BSD-Style. -- MenuCheck.py: check hardcoded path in icon field and large, mini, - normal icon files. -- PostCheck.py: Fix typo in check of /usr/bin/perl. -- PostCheck.py: Check perl script like we do for bash script. -- I18NCheck.py: updated locales list -- FilesCheck.py: Only check perl_temp_file in a /perl/ directory. - -* Fri Aug 25 2000 Frederic Lepied 0.20-1mdk -- InitScriptCheck.py: new check for /etc/rc.d/init.d scripts. -- PostCheck.py: check when a script is present that the shell is valid. -- ConfigCheck.py: report warnings for app-defaults only -in /usr/X11R6/lib/X11/app-defaults. -- BinariesCheck.py: report the rpath warning if the directory isn't a -sub-directory of /usr/lib/. - -* Fri Aug 18 2000 Frederic Lepied 0.19-1mdk -- BinariesCheck.py: check rpath only on system lib paths (ie /lib, -/usr/lib and /usr/X11R6/lib). This can be configured with the -SystemLibPaths option. -- I18NCheck.py: warn if .mo is not registered in %%lang. -- MenuCheck.py: protected kdesu check. -- FilesCheck.py: check perl temporary files. -- rpmlint.py: added ExtractDir option usable in the config -file. -- PostCheck.py: check ] in if statement. report warning for a -percent. - -* Thu Aug 10 2000 Frederic Lepied 0.18-1mdk -- TagsCheck: check licence file. -- ConfigCheck: check files without no-replace flag. -- MenuCheck: allow depency on kdesu to point directly to /usr/bin/kdesu. -- FHSCheck: allow ftp and www in var (from upcoming FHS 2.2). - -* Tue Aug 8 2000 Frederic Lepied 0.17-1mdk -- PostCheck: check bourne shell syntax (Chmouel). -- FileCheck: o check chkconfig calls for packages with a file in - /etc/rc.d/init.d. - o allow the call to install-info to be in %%preun. -- MenuCheck: o take care of kdesu (Chmouel). -- various exceptions added. - -* Wed Jul 19 2000 Frederic Lepied 0.16-1mdk -- FHSCheck activated by default. -- FileCheck: o check dangling symlinks. - o check info/dir. - -* Tue Jun 27 2000 Frederic Lepied 0.15-1mdk -- 0.15: - o check non transparent pixmaps in icon path - o added a check for soname - o added a warning for packages that provide themselves (for Pixel) - o corrected check for needs in menu files. - o various exceptions added. - -* Mon Apr 17 2000 Frederic Lepied 0.14-1mdk -- 0.14: - o MenuCheck: check old entries from KDE and GNOME and allow entries -for sections. - o config: exceptions for urpmi, sash, octave, ghc, procmail, rsh. - o extract temp files in /. - -* Mon Apr 10 2000 Frederic Lepied 0.13-1mdk -- 0.13: - o MenuCheck: issue a warning if no icon specified (Chmouel). - corrected list of correct sections (Chmouel). - o FilesCheck: check ldconfig calls in %%post and %%postun if the package -provide a library. - o config: new exceptions added. - o BinariesCheck: check non sparc32 binaries in sparc packages. - -* Fri Mar 31 2000 Frederic Lepied 0.12-1mdk -- 0.12: - o MenuCheck: check binaries launched by menus and - check update-menus %%post and %%postun. - o BinariesCheck: check for non sparc32 binaries in sparc rpms. - -* Mon Mar 27 2000 Frederic Lepied 0.11-1mdk -- 0.11: - o check menu files. - -* Tue Mar 14 2000 Frederic Lepied 0.10-1mdk -- 1.10: - o check .h, .a and .so in non devel package. - o check files in /home. - o corrected lists of groups. - -* Mon Feb 28 2000 Frederic Lepied 0.9.2-1mdk -- added a dependency on rpm-python. -- corrected rpm 3.0.4 support. - -* Wed Feb 23 2000 Frederic Lepied 0.9.1-1mdk -- updated to support the way rpm 3.0.4 stores file names. - -* Thu Feb 10 2000 Frederic Lepied 0.9-1mdk - -- 0.9: * gpg support. - * check release extension. - * check non executable in bin directories. - * new options: ValidGroups, ReleaseExtension and - UseVersionInChangelog. - -* Thu Dec 30 1999 Frederic Lepied 0.8-1mdk - -- 0.8: I18N checks, some exceptions added. - -* Mon Nov 15 1999 Frederic Lepied - -- 0.7: more robust cleanup, filters are regexp now and added -exception for /var/catman subirs beeing setgid. - -* Sat Oct 23 1999 Frederic Lepied - -- 0.6.1: corrected compilation step. - -* Sat Oct 23 1999 Frederic Lepied - -- 0.6: filter output, documentation checks. - -* Fri Oct 15 1999 Frederic Lepied - -- 0.5: FHS check, configuration files. - -* Fri Oct 8 1999 Chmouel Boudjnah -- Add Doc. - -* Thu Oct 7 1999 Frederic Lepied - -- version 0.4: pgp check and group name check. - -* Wed Oct 6 1999 Frederic Lepied - -- version 0.3. - -* Mon Oct 4 1999 Frederic Lepied - -- version 0.2. - -* Fri Oct 1 1999 Frederic Lepied - -- First spec file for Mandrake distribution. diff --git a/sources b/sources index 9c76f99..df0dd03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b3e0d8eb10b6013d8987ce5a180c7ae rpmlint-0.67.tar.bz2 +e321c9868b403366d314c77e637e09b9 rpmlint-0.68.tar.bz2