packages (rpm-4_5): rpm/rpm-gid-uucp.patch, rpm/rpm.spec - hardcode gid=adm...

[glen]

Author: glen                         Date: Fri Jun 19 16:37:30 2009 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- hardcode gid=adm for filesystem; rel 22

---- Files affected:
packages/rpm:
   rpm-gid-uucp.patch (1.1 -> 1.2) , rpm.spec (1.837.2.42.2.49.2.62 -> 1.837.2.42.2.49.2.63) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-gid-uucp.patch
diff -u packages/rpm/rpm-gid-uucp.patch:1.1 packages/rpm/rpm-gid-uucp.patch:1.2
--- packages/rpm/rpm-gid-uucp.patch:1.1	Thu Jun  4 23:47:03 2009
+++ packages/rpm/rpm-gid-uucp.patch	Fri Jun 19 18:37:24 2009
@@ -1,12 +1,12 @@
---- rpm-4.5/rpmio/ugid.c~	2004-10-09 20:29:23.000000000 +0300
-+++ rpm-4.5/rpmio/ugid.c	2009-06-05 00:46:30.450894061 +0300
+--- rpm-4.5/rpmio/ugid.c	2009-06-05 00:46:30.450894061 +0300
++++ rpm-4.5/rpmio/ugid.c	2009-06-19 19:35:42.374530092 +0300
 @@ -101,10 +101,10 @@
  	    /*@=internalglobs@*/
  	    grent = getgrnam(thisGname);
  	    if (grent == NULL) {
 -		/* XXX The filesystem package needs group/lock w/o getgrnam. */
 -		if (strcmp(thisGname, "lock") == 0) {
-+		/* XXX The FHS package needs group/uucp w/o getgrnam. */
++		/* XXX The FHS package needs group/uucp w/o getgrnam, filesystem needs adm */
 +		if (strcmp(thisGname, "uucp") == 0) {
  /*@-boundswrite@*/
 -		    *gid = lastGid = 54;
@@ -14,3 +14,16 @@
  /*@=boundswrite@*/
  		    return 0;
  		} else
+@@ -114,6 +114,12 @@
+ /*@=boundswrite@*/
+ 		    return 0;
+ 		} else
++		if (strcmp(thisGname, "adm") == 0) {
++/*@-boundswrite@*/
++		    *gid = lastGid = 4;
++/*@=boundswrite@*/
++		    return 0;
++		} else
+ 		return -1;
+ 	    }
+ 	}

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.62 packages/rpm/rpm.spec:1.837.2.42.2.49.2.63
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.62	Tue Jun 16 18:10:22 2009
+++ packages/rpm/rpm.spec	Fri Jun 19 18:37:24 2009
@@ -56,7 +56,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	21
+Release:	22
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -1442,6 +1442,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.63  2009/06/19 16:37:24  glen
+- hardcode gid=adm for filesystem; rel 22
+
 Revision 1.837.2.42.2.49.2.62  2009/06/16 16:10:22  tommat
 - undefine apidocs on sparcs, no graphviz for now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-gid-uucp.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.62&r2=1.837.2.42.2.49.2.63&f=u