From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 19 Jun 2009 16:37:24 +0000 (+0000)
Subject: - hardcode gid=adm for filesystem; rel 22
X-Git-Tag: auto/th/rpm-4_5-48~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=2bd6134438ea301f270ab3925ee9776d5fc6304f

- hardcode gid=adm for filesystem; rel 22

Changed files:
    rpm-gid-uucp.patch -> 1.2
---

diff --git a/rpm-gid-uucp.patch b/rpm-gid-uucp.patch
index dc9819a..765adf0 100644
--- a/rpm-gid-uucp.patch
+++ b/rpm-gid-uucp.patch
@@ -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;
+ 	    }
+ 	}