- PAM fix

Changed files:
    XFree86-PLD.patch -> 1.4
    XFree86-Xwrapper.patch -> 1.3

diff --git a/XFree86-PLD.patch b/XFree86-PLD.patch
index 8954e9b4246d25208d202f4ee985b6d87a7180be..3e4033d5de816163901e227e688766ec01214a9b 100644 (file)
--- a/XFree86-PLD.patch
+++ b/XFree86-PLD.patch
@@ -230,7 +230,7 @@ diff -Nur XFree86-4.0.2.org/xc/config/cf/linux.cf XFree86-4.0.2/xc/config/cf/lin
 diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/site.def
 --- XFree86-4.0.2.org/xc/config/cf/site.def    Tue Jun 27 02:55:45 2000
 +++ XFree86-4.0.2/xc/config/cf/site.def        Wed Dec 20 13:41:02 2000
-@@ -131,10 +131,13 @@
+@@ -131,10 +131,14 @@
  #define HasSentinel   YES
  */
  
@@ -244,6 +244,7 @@ diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/sit
 +
 +
 +#define HasPam    YES
++#define HasPamMisc    YES
  
  
  /* You do NOT need SetUID if you only run the server under xdm */
@@ -596,3 +597,14 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xterm/xterm.h XFree86-4.0.2/xc/programs/
  #endif
  
  #ifndef X_NOT_POSIX
+--- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile~    Thu Dec 14 20:47:46 2000
++++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile     Fri Dec 22 17:58:27 2000
+@@ -92,7 +92,7 @@
+ 
+ #if HasNCurses
+ CURSESLIB = NCursesLibName
+-CURSESDEFINES  = -DHAS_NCURSES
++CURSESDEFINES  = -DHAS_NCURSES -I/usr/include/ncurses
+ #endif
+ 
+ DEFINES        = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index e2121920c8aaa425eb740f2fe3e6ac2061b92a85..820f98a78e06be7177234ba6e099c8bac056bd7a 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -80,15 +80,6 @@ diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/Imakefile XFree86-4.0.2/xc/progr
  #include <Server.tmpl>
  
  #ifdef XFree86Version
-@@ -264,7 +259,7 @@
-    EXTRASYSLIBS = ServerExtraSysLibs
- #endif
- #if HasPam && HasPamMisc
--        PAMLIBS = PamLibraries PamMiscLibraries
-+        PAMLIBS = -lpam -lpam_misc -ldl PamLibraries PamMiscLibraries
- #endif
- #if !(SystemV4 || defined(SGIArchitecture) || UseRgbTxt)
-        DBMLIBS = DBMLibrary
 @@ -1017,6 +1012,11 @@
        $(XNESTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XNESTSYSLIBS))
  #endif /* XnestServer */