[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f - IPFire-SCM

13 Mar 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f (commit)
       via  bbaafb6bdf1a57eac2d69ca4e953579b2f280bca (commit)
       via  ab67471f1e1630995e8803f9e0a87e4ff845ff1a (commit)
      from  7a7d1fdc77082e905cccf695c5cde49596a31d7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f
Merge: 7a7d1fd bbaafb6
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 13 16:56:55 2011 +0100
Merge remote-tracking branch 'stevee/shadow'
commit bbaafb6bdf1a57eac2d69ca4e953579b2f280bca
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 13 16:43:49 2011 +0100
shadow: Update to 4.1.4.3.
Fixes #138.
commit ab67471f1e1630995e8803f9e0a87e4ff845ff1a
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Mar 13 15:22:03 2011 +0100
perl-libwww-perl: New package.
Fixes #144.
-----------------------------------------------------------------------
Summary of changes:
 .../perl-libwww-perl.nm}                           |   19 ++++++++-----------
 ...oodname.patch => shadow-4.1.4.3-goodname.patch} |    2 +-
 pkgs/shadow/shadow.nm                              |    7 +++++--
 3 files changed, 14 insertions(+), 14 deletions(-)
 copy pkgs/{perl-URI/perl-URI.nm => perl-libwww-perl/perl-libwww-perl.nm} (81%)
 rename pkgs/shadow/patches/{shadow-4.1.4.2-goodname.patch => shadow-4.1.4.3-goodname.patch} (98%)
Difference in files:

diff --git a/pkgs/perl-libwww-perl/perl-libwww-perl.nm b/pkgs/perl-libwww-perl/perl-libwww-perl.nm
new file mode 100644
index 0000000..8226085
--- /dev/null
+++ b/pkgs/perl-libwww-perl/perl-libwww-perl.nm
@@ -0,0 +1,50 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = libwww-perl
+PKG_VER        = 6.01
+PKG_REL        = 1
+PKG_ARCH       = noarch
+
+PKG_MAINTAINER =
+PKG_GROUP      = Development/Libraries
+PKG_URL        = http://search.cpan.org/dist/libwww-perl/
+PKG_LICENSE    = GPL+ or Artistic
+PKG_SUMMARY    = A Perl interface to the World-Wide Web.
+
+PKG_BUILD_DEPS+= perl-core perl-devel
+
+define PKG_DESCRIPTION
+	The libwww-perl collection is a set of Perl modules which provides a simple and \
+	consistent application programming interface to the World-Wide Web.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+
+define STAGE_BUILD
+	cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=perl --aliases < /dev/null
+	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
diff --git a/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch b/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch
deleted file mode 100644
index 45e3814..0000000
--- a/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c
---- shadow-4.1.4.2_orig/libmisc/chkname.c	2009-04-28 19:14:04.000000000 +0000
-+++ shadow-4.1.4.2/libmisc/chkname.c	2009-08-03 18:47:59.000000000 +0000
-@@ -49,21 +49,29 @@
- static bool is_valid_name (const char *name)
- {
- 	/*
--	 * User/group names must match [a-z_][a-z0-9_-]*[$]
--	 */
--	if (('\0' == *name) ||
--	    !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
-+	* User/group names must match gnu e-regex:
-+	*    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
-+	*
-+	* as a non-POSIX, extension, allow "$" as the last char for
-+	* sake of Samba 3.x "add machine script"
-+	*/
-+	if ( ('\0' == *name) ||
-+		!((*name >= 'a' && *name <= 'z') ||
-+		  (*name >= 'A' && *name <= 'Z') ||
-+		  (*name >= '0' && *name <= '9') ||
-+		  (*name == '_') || (*name == '.') 
-+	)) {
- 		return false;
- 	}
- 
- 	while ('\0' != *++name) {
--		if (!(( ('a' <= *name) && ('z' >= *name) ) ||
--		      ( ('0' <= *name) && ('9' >= *name) ) ||
--		      ('_' == *name) ||
--		      ('-' == *name) ||
--		      ( ('$' == *name) && ('\0' == *(name + 1)) )
--		     )) {
--			return false;
-+		if (!(  (*name >= 'a' && *name <= 'z') ||
-+			(*name >= 'A' && *name <= 'Z') ||
-+			(*name >= '0' && *name <= '9') ||
-+			(*name == '_') || (*name == '.') || (*name == '-') ||
-+			(*name == '$' && *(name + 1) == '\0') 
-+		)) {
-+		return false;
- 		}
- 	}
- 
-diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8
---- shadow-4.1.4.2_orig/man/groupadd.8	2009-07-24 01:16:24.000000000 +0000
-+++ shadow-4.1.4.2/man/groupadd.8	2009-08-03 18:51:10.000000000 +0000
-@@ -153,9 +153,7 @@
- .RE
- .SH "CAVEATS"
- .PP
--Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
--.PP
--Groupnames may only be up to 16 characters long&.
-+Groupnames may only be up to 32 characters long&.
- .PP
- You may not add a NIS or LDAP group&. This must be performed on the corresponding server&.
- .PP
-diff -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8
---- shadow-4.1.4.2_orig/man/useradd.8	2009-07-24 01:16:44.000000000 +0000
-+++ shadow-4.1.4.2/man/useradd.8	2009-08-03 18:51:52.000000000 +0000
-@@ -405,8 +405,6 @@
- \fBuseradd\fR
- will deny the user account creation request&.
- .PP
--Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
--.PP
- Usernames may only be up to 32 characters long&.
- .SH "CONFIGURATION"
- .PP
diff --git a/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch b/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch
new file mode 100644
index 0000000..fe49765
--- /dev/null
+++ b/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch
@@ -0,0 +1,70 @@
+diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c
+--- shadow-4.1.4.2_orig/libmisc/chkname.c	2009-04-28 19:14:04.000000000 +0000
++++ shadow-4.1.4.2/libmisc/chkname.c	2009-08-03 18:47:59.000000000 +0000
+@@ -49,21 +49,29 @@
+ static bool is_valid_name (const char *name)
+ {
+ 	/*
+-	 * User/group names must match [a-z_][a-z0-9_-]*[$]
+-	 */
+-	if (('\0' == *name) ||
+-	    !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
++	* User/group names must match gnu e-regex:
++	*    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
++	*
++	* as a non-POSIX, extension, allow "$" as the last char for
++	* sake of Samba 3.x "add machine script"
++	*/
++	if ( ('\0' == *name) ||
++		!((*name >= 'a' && *name <= 'z') ||
++		  (*name >= 'A' && *name <= 'Z') ||
++		  (*name >= '0' && *name <= '9') ||
++		  (*name == '_') || (*name == '.') 
++	)) {
+ 		return false;
+ 	}
+ 
+ 	while ('\0' != *++name) {
+-		if (!(( ('a' <= *name) && ('z' >= *name) ) ||
+-		      ( ('0' <= *name) && ('9' >= *name) ) ||
+-		      ('_' == *name) ||
+-		      ('-' == *name) ||
+-		      ( ('$' == *name) && ('\0' == *(name + 1)) )
+-		     )) {
+-			return false;
++		if (!(  (*name >= 'a' && *name <= 'z') ||
++			(*name >= 'A' && *name <= 'Z') ||
++			(*name >= '0' && *name <= '9') ||
++			(*name == '_') || (*name == '.') || (*name == '-') ||
++			(*name == '$' && *(name + 1) == '\0') 
++		)) {
++		return false;
+ 		}
+ 	}
+ 
+diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8
+--- shadow-4.1.4.2_orig/man/groupadd.8	2009-07-24 01:16:24.000000000 +0000
++++ shadow-4.1.4.2/man/groupadd.8	2009-08-03 18:51:10.000000000 +0000
+@@ -153,9 +153,7 @@
+ .RE
+ .SH "CAVEATS"
+ .PP
+-Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+-.PP
+-Groupnames may only be up to characters long&.
++Groupnames may only be up to 32 characters long&.
+ .PP
+ You may not add a NIS or LDAP group&. This must be performed on the corresponding server&.
+ .PP
+diff -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8
+--- shadow-4.1.4.2_orig/man/useradd.8	2009-07-24 01:16:44.000000000 +0000
++++ shadow-4.1.4.2/man/useradd.8	2009-08-03 18:51:52.000000000 +0000
+@@ -405,8 +405,6 @@
+ \fBuseradd\fR
+ will deny the user account creation request&.
+ .PP
+-Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+-.PP
+ Usernames may only be up to 32 characters long&.
+ .SH "CONFIGURATION"
+ .PP
diff --git a/pkgs/shadow/shadow.nm b/pkgs/shadow/shadow.nm
index d7ec1ed..e8c8f55 100644
--- a/pkgs/shadow/shadow.nm
+++ b/pkgs/shadow/shadow.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
PKG_NAME       = shadow
-PKG_VER        = 4.1.4.2
-PKG_REL        = 2
+PKG_VER        = 4.1.4.3
+PKG_REL        = 3
PKG_MAINTAINER =
 PKG_GROUP      = System/Base
@@ -66,6 +66,9 @@ define STAGE_PREPARE_CMDS
# Do not install korean and zh man pages
    cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in
+
+	# Do not install russion man pages - was broken in 4.1.4.3
+	cd $(DIR_APP) && sed -i -e 's/ ru//' man/Makefile.in
 endef
define STAGE_INSTALL_CMDS
hooks/post-receive
--
IPFire 3.x development tree

    