From cdccd43cb4f12a01be768f7be2e288cf9f68b785 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Nov 01 2010 21:40:13 +0000
Subject: Merge branch 'master' into f14


---

diff --git a/.gitignore b/.gitignore
index 99a860b..568a5e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-rpmlint-0.99.tar.bz2
+/rpmlint-1.0.tar.bz2
diff --git a/rpmlint.config b/rpmlint.config
index f9fe242..3c4d6e3 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -40,8 +40,9 @@ setOption("DanglingSymlinkExceptions", (
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with revision "1.80, 16 August 2010" of that page.
+    # Last synced with revision "1.85, 21 October 2010" of that page.
     'AAL',
+    'Abstyles',
     'Adobe',
     'ADSL',
     'AFL',
@@ -62,7 +63,7 @@ setOption("ValidLicenses", (
     'ASL 1.1+',
     'ASL 2.0',
     'ASL 2.0+',
-    'Beerware',
+    'Barr',
     'BeOpen',
     'BitTorrent',
     'Boost',
@@ -80,8 +81,10 @@ setOption("ValidLicenses", (
     'Copyright only',
     'CPAL',
     'CPL',
+    'Crossword',
     'Crystal Stacker',
     'DOC',
+    'Dotseqn',
     'dvipdfm',
     'ECL 1.0',
     'ECL 2.0',
@@ -126,6 +129,7 @@ setOption("ValidLicenses", (
     'JasPer',
     'JPython',
     'Knuth',
+    'Latex2e',
     'LBNL BSD',
     'LGPLv2',
     'LGPLv2 with exceptions',
@@ -136,6 +140,7 @@ setOption("ValidLicenses", (
     'LGPLv3 with exceptions',
     'LGPLv3+',
     'LGPLv3+ with exceptions',
+    'Lhcyr',
     'libtiff',
     'LLGPL',
     'Logica',
@@ -158,6 +163,7 @@ setOption("ValidLicenses", (
     'NetCDF',
     'Netscape',
     'Newmat',
+    'Newsletr',
     'NGPL',
     'Nokia',
     'NOSL',
@@ -191,6 +197,7 @@ setOption("ValidLicenses", (
     'RiceBSD',
     'Romio',
     'RPSL',
+    'Rsfs',
     'Ruby',
     'Saxpath',
     'SCEA',
@@ -203,6 +210,7 @@ setOption("ValidLicenses", (
     'SPL',
     'TCL',
     'Teeworlds',
+    'Threeparttable',
     'TMate',
     'TOSL',
     'TPL',
@@ -213,12 +221,14 @@ setOption("ValidLicenses", (
     'VSL',
     'W3C',
     'Webmin',
+    'Wsuipa',
     'WTFPL',
     'wxWidgets',
     'Xerox',
     'xinetd',
     'XSkat',
     'YPLv1.1',
+    'Zed',
     'Zend',
     'zlib',
     'zlib with acknowledgement',
@@ -337,6 +347,13 @@ addFilter("filename-too-long-for-joliet")
 addFilter("symlink-should-be-")
 addFilter("dangling-\S*symlink /usr/share/doc/HTML/\S+/common .+/common$")
 addFilter("hidden-file-or-dir .*/man5/\.k5login\.5[^/]+$")
-# TODO: more whitelisted executables, https://bugzilla.redhat.com/496737
-addFilter("krb5-workstation.+ (setuid-binary|non-standard-executable-perm) /usr/kerberos/bin/ksu (root )?04755")
 addFilter("blender.+ (wrong-script-interpreter|non-executable-script) .+/blender/.+\.py.*BPY.*")
+# https://bugzilla.redhat.com/496737, https://bugzilla.redhat.com/646455
+for pkg, exe in (("coreutils", "/bin/su"),
+                 ("krb5-workstation", "/usr/kerberos/bin/ksu"),
+                 ("passwd", "/usr/bin/passwd"),
+                 ("sudo", "/usr/bin/sudo(edit)?"),
+                 ("upstart", "/sbin/initctl"),
+                 ("usermode", "/usr/sbin/userhelper")):
+    addFilter("%s.* (setuid-binary|non-standard-executable-perm) %s (root )?04"
+              % (pkg, exe))
diff --git a/rpmlint.spec b/rpmlint.spec
index 43411a2..94d6c02 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.99
+Version:        1.0
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -78,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov  1 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.0-1
+- Update to 1.0; fixes #637956, and #639823.
+- Sync Fedora license list with Wiki revision 1.85.
+- Whitelist more expectedly setuid executables; fixes #646455.
+
 * Thu Aug 19 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.99-1
 - Update to 0.99; fixes #623607, helps work around #537430.
 - Sync Fedora license list with Wiki revision 1.80.
diff --git a/sources b/sources
index 799e592..f857008 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c659bc0f351a3445a4a262b7a9277580  rpmlint-0.99.tar.bz2
+c27b574f3e70a3ffeb8eeb550e597c2d  rpmlint-1.0.tar.bz2