Changeset e7e4f53 for final-system/multilib

Timestamp:

Feb 21, 2006, 2:13:50 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

50b478a2

Parents:

288217a9

Message:

r1087@server (orig r1085): chris | 2006-01-19 09:19:02 -0800
Removed shadow configure patch

Location:

final-system/multilib

Files:

• shadow-64bit.xml (modified) (5 diffs)
• shadow-n32.xml (modified) (3 diffs)
• shadow.xml (modified) (3 diffs)

final-system/multilib/shadow-64bit.xml

@@ -39 +39 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-   --enable-shared</userinput></screen>
+   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -77 +69 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
@@ -109 +101 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
+    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
+    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
@@ -119 +111 @@
     href="shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
 
 <screen os="u"><userinput>mv /lib64/libshadow.*a /usr/lib64
@@ -126 +126 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
+    xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
+    xpointer="xpointer(//*[@os='y'])"/>
 
   </sect2>

final-system/multilib/shadow-n32.xml

@@ -40 +40 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-   --enable-shared</userinput></screen>
+   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -79 +71 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89 +81 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-<screen os="u"><userinput>mv /lib32/libshadow.*a /usr/lib32
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
+<screen os="w"><userinput>mv /lib32/libshadow.*a /usr/lib32
 rm /lib32/libshadow.so
 ln -sf ../../lib32/libshadow.so.0 /usr/lib32/libshadow.so</userinput></screen>

final-system/multilib/shadow.xml

@@ -29 +29 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-   --enable-shared</userinput></screen>
+   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -68 +60 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -81 +73 @@
     href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
 
   </sect2>