Accepting request 97074 from devel:openSUSE:Factory:rpmlint

- create the valid licenses from list tracked by SUSE legal (dumped
  into obs-service_format_spec_file, so use that one as buildrequire)

- added: standard group 'tor'
- added: standard user 'tor'

OBS-URL: https://build.opensuse.org/request/show/97074
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=150
This commit is contained in:
Stephan Kulow 2011-12-21 09:03:41 +00:00 committed by Git OBS Bridge
commit 11e24cbf93
4 changed files with 25 additions and 155 deletions

2
config
View File

@ -164,6 +164,7 @@ setOption('StandardGroups', (
'tftp',
'tomcat',
'tomcat4',
'tor',
'trusted',
'tss',
'tty',
@ -281,6 +282,7 @@ setOption('StandardUsers', (
'tftp',
'tomcat',
'tomcat4',
'tor',
'tss',
'ulogd',
'upsd',

View File

@ -12,158 +12,6 @@ their exact spelling.""")
# from http://www.spdx.org/licenses/
setOption('ValidLicenses', (
'AFL-1.2',
'AFL-2.0',
'AFL-2.1',
'AFL-3.0',
'APL-1.0',
'ANTLR-PD',
'Apache-1.0',
'Apache-1.1',
'Apache-2.0',
'APSL-1.0',
'APSL-1.1',
'APSL-1.2',
'APSL-2.0',
'Artistic-1.0',
'Artistic-2.0',
'AAL',
'BSL-1.0',
'BSD-2-Clause',
'BSD-3-Clause',
'BSD-4-Clause',
'CECILL-1.0',
'CECILL-1.1English',
'CECILL-2.0',
'CECILL-B',
'CECILL-C',
'ClArtistic',
'CDDL-1.0',
'CPAL-1.0',
'CPL-1.0',
'CATOSL-1.1',
'CC-BY-1.0',
'CC-BY-2.0',
'CC-BY-2.5',
'CC-BY-3.0',
'CC-BY-ND-1.0',
'CC-BY-ND-2.0',
'CC-BY-ND-2.5',
'CC-BY-ND-3.0',
'CC-BY-NC-1.0',
'CC-BY-NC-2.0',
'CC-BY-NC-2.5',
'CC-BY-NC-3.0',
'CC-BY-NC-ND-1.0',
'CC-BY-NC-ND-2.0',
'CC-BY-NC-ND-2.5',
'CC-BY-NC-ND-3.0',
'CC-BY-NC-SA-1.0',
'CC-BY-NC-SA-2.0',
'CC-BY-NC-SA-2.5',
'CC-BY-NC-SA-3.0',
'CC-BY-SA-1.0',
'CC-BY-SA-2.0',
'CC-BY-SA-2.5',
'CC-BY-SA-3.0',
'CC0-1.0',
'CUA-OPL-1.0',
'EPL-1.0',
'eCos-2.0',
'ECL-1.0',
'ECL-2.0',
'EFL-1.0',
'EFL-2.0',
'Entessa',
'ErlPL-1.1',
'EUDatagrid',
'EUPL-1.0',
'EUPL-1.1',
'Fair',
'Frameworx-1.0',
'AGPL-3.0',
'GFDL-1.1',
'GFDL-1.2',
'GFDL-1.3',
'GPL-1.0',
'GPL-1.0+',
'GPL-2.0',
'GPL-2.0+',
'GPL-2.0-with-autoconf-exception',
'GPL-2.0-with-bison-exception',
'GPL-2.0-with-classpath-exception',
'GPL-2.0-with-font-exception',
'GPL-2.0-with-GCC-exception',
'GPL-3.0',
'GPL-3.0+',
'GPL-3.0-with-autoconf-exception',
'GPL-3.0-with-GCC-exception',
'LGPL-2.1',
'LGPL-2.1+',
'LGPL-3.0',
'LGPL-3.0+',
'LGPL-2.0',
'LGPL-2.0+',
'gSOAP-1.3b',
'HPND',
'IPL-1.0',
'IPA',
'ISC',
'LPPL-1.0',
'LPPL-1.1',
'LPPL-1.2',
'LPPL-1.3c',
'Libpng',
'LPL-1.02',
'MS-PL',
'MS-RL',
'MirOS',
'MIT',
'Motosoto',
'MPL-1.0',
'MPL-1.1',
'Multics',
'NASA-1.3',
'Naumen',
'NGPL',
'Nokia',
'NPOSL-3.0',
'NTP',
'OCLC-2.0',
'ODbL-1.0',
'PDDL-1.0',
'OGTSL',
'OSL-1.0',
'OSL-2.0',
'OSL-3.0',
'OLDAP-2.8',
'OpenSSL',
'PHP-3.01',
'PostgreSQL',
'Python-2.0',
'QPL-1.0',
'RPSL-1.0',
'RPL-1.5',
'RHeCos-1.1',
'RSCPL',
'Ruby',
'SAX-PD',
'OFL-1.1',
'SimPL-2.0',
'Sleepycat',
'SugarCRM-1.1.3',
'SPL-1.0',
'Watcom-1.0',
'NCSA',
'VSL-1.0',
'W3C',
'WXwindows',
'Xnet',
'XFree86-1.1',
'YPL-1.1',
'Zimbra-1.3',
'Zlib',
'ZPL-1.1',
'ZPL-2.0',
'ZPL-2.1',
# generated in spec file
#VALIDLICENSES
))

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Dec 16 10:56:26 UTC 2011 - coolo@suse.com
- create the valid licenses from list tracked by SUSE legal (dumped
into obs-service_format_spec_file, so use that one as buildrequire)
-------------------------------------------------------------------
Tue Dec 13 21:11:09 UTC 2011 - andreas.stieger@gmx.de
- added: standard group 'tor'
- added: standard user 'tor'
-------------------------------------------------------------------
Tue Dec 13 14:31:28 UTC 2011 - coolo@suse.com

View File

@ -15,9 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#!BuildIgnore: rpmlint-mini
Name: rpmlint
BuildRequires: obs-service-format_spec_file
BuildRequires: rpm-python
BuildRequires: xz
Summary: Rpm correctness checker
@ -240,7 +242,13 @@ head -n 8 $RPM_BUILD_ROOT/usr/share/rpmlint/config > $RPM_BUILD_ROOT/etc/rpmlint
python -tt %{SOURCE100} $RPM_BUILD_ROOT/usr/share/rpmlint/*.py $RPM_BUILD_ROOT/usr/share/rpmlint/config
%__install -m 644 %{SOURCE20} %{buildroot}/%{_sysconfdir}/rpmlint/
%__install -m 644 %{SOURCE24} %{buildroot}/%{_sysconfdir}/rpmlint/
%__install -m 644 %{SOURCE25} %{buildroot}/%{_sysconfdir}/rpmlint/
cp %{SOURCE25} licenses.config
# note there is a tab character behind the -d, so don't copy&paste lightly
cut '-d ' -f1 /usr/lib/obs/service/format_spec_file.files/licenses_changes.txt | tail -n +2 | sort -u | while read l; do
sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config
done
%__install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/
%clean
rm -rf $RPM_BUILD_ROOT