r2726 - in trunk: BOOK BOOK/general/graphlib BOOK/introduction/welcome BOOK/postlfs/security patches

larry at linuxfromscratch.org larry at linuxfromscratch.org
Wed Sep 8 08:22:42 PDT 2004


Author: larry
Date: 2004-09-08 09:22:39 -0600 (Wed, 08 Sep 2004)
New Revision: 2726

Added:
   trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch
Removed:
   trunk/patches/libpng-1.2.6rc1-link_to_proper_libs-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/libpng.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/gnupg.xml
Log:
update to libpng-1.2.6

Modified: trunk/BOOK/general/graphlib/libpng.xml
===================================================================
--- trunk/BOOK/general/graphlib/libpng.xml	2004-09-08 14:40:51 UTC (rev 2725)
+++ trunk/BOOK/general/graphlib/libpng.xml	2004-09-08 15:22:39 UTC (rev 2726)
@@ -6,6 +6,7 @@
 
 <!ENTITY libpng-download-http "http://prdownloads.sourceforge.net/libpng/libpng-&libpng-version;.tar.bz2">
 <!ENTITY libpng-download-ftp " ">
+<!ENTITY libpng-md5 "2518e496ad45c3531285b58016a6be5c">
 <!ENTITY libpng-size "369 KB">
 <!ENTITY libpng-buildsize "4.5 MB">
 <!ENTITY libpng-time "0.2 SBU">
@@ -33,6 +34,7 @@
 url="&libpng-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&libpng-download-ftp;"/></para></listitem>
+<listitem><para>MD5 Sum: &libpng-md5;</para></listitem>
 <listitem><para>Download size: &libpng-size;</para></listitem>
 <listitem><para>Estimated Disk space required:
 &libpng-buildsize;</para></listitem>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-09-08 14:40:51 UTC (rev 2725)
+++ trunk/BOOK/general.ent	2004-09-08 15:22:39 UTC (rev 2726)
@@ -28,7 +28,7 @@
 <!ENTITY Linux_PAM-version            "0.77">  
 <!ENTITY shadow-version               "4.0.4.1">  
 <!ENTITY iptables-version             "1.2.11"> 
-<!ENTITY gnupg-version                "1.2.5">  
+<!ENTITY gnupg-version                "1.2.6">  
 <!ENTITY tripwire-version             "2.3.1-2">   
 <!ENTITY heimdal-version              "0.6.2">   
 <!ENTITY mitkrb-version               "1.3.4"> 
@@ -77,7 +77,7 @@
                                      
 <!-- Chapter 9 -->                   
 <!ENTITY libjpeg-version              "6b">
-<!ENTITY libpng-version               "1.2.6rc1">
+<!ENTITY libpng-version               "1.2.6">
 <!ENTITY libtiff-version              "3.6.1">
 <!ENTITY libungif-version             "4.1.0b1">
 <!ENTITY libmng-version               "1.0.7">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-08 14:40:51 UTC (rev 2725)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-08 15:22:39 UTC (rev 2726)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>September 8th, 2004 [larry]: Updated to
+gnupg-1.2.6 and libpng-1.2.6.</para></listitem>
+
 <listitem><para>September 8th, 2004 [randy]: Added optional dependencies, 
 entity updates and minor corrections to the GnuCash instructions.</para>
 </listitem>

Modified: trunk/BOOK/postlfs/security/gnupg.xml
===================================================================
--- trunk/BOOK/postlfs/security/gnupg.xml	2004-09-08 14:40:51 UTC (rev 2725)
+++ trunk/BOOK/postlfs/security/gnupg.xml	2004-09-08 15:22:39 UTC (rev 2726)
@@ -6,8 +6,9 @@
 
   <!ENTITY gnupg-download-http "http://public.ftp.planetmirror.com/pub/gnupg/gnupg-&gnupg-version;.tar.bz2">
   <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
+  <!ENTITY gnupg-md5           "b1890f5dfacd2ba7ab15448c5ff08a4e">
   <!ENTITY gnupg-size          "2.5 MB">
-  <!ENTITY gnupg-buildsize     "28 MB">
+  <!ENTITY gnupg-buildsize     "22.3 MB">
   <!ENTITY gnupg-time          "0.44 SBU">
 ]>
 
@@ -32,6 +33,7 @@
 url="&gnupg-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&gnupg-download-ftp;"/></para></listitem>
+<listitem><para>MD5 Sum: &gnupg-md5;</para></listitem>
 <listitem><para>Download size: &gnupg-size;</para></listitem>
 <listitem><para>Estimated Disk space required:
 &gnupg-buildsize;</para></listitem>
@@ -39,13 +41,13 @@
 &gnupg-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
+<!-- <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink 
 url="&patch-root;/gnupg-&gnupg-version;-po_install_fix-1.patch"/>
 </para></listitem>
 </itemizedlist>
-</sect3>
+</sect3> -->
 
 <sect3><title><application>GnuPG</application> dependencies</title>
 <sect4><title>Optional</title>
@@ -63,8 +65,7 @@
 <para>Install <application>GnuPG</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../gnupg-&gnupg-version;-po_install_fix-1.patch &&
-./configure --prefix=/usr --libexecdir=/usr/lib &&
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib &&
 make &&
 make install &&
 chmod 4755 /usr/bin/gpg</command></userinput></screen>

Copied: trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch (from rev 2723, trunk/patches/libpng-1.2.6rc1-link_to_proper_libs-1.patch)
===================================================================
--- trunk/patches/libpng-1.2.6rc1-link_to_proper_libs-1.patch	2004-09-07 18:55:05 UTC (rev 2723)
+++ trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch	2004-09-08 15:22:39 UTC (rev 2726)
@@ -0,0 +1,60 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
+Date: 2004-08-05
+Initial Package Version: 1.2.6
+Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
+Description: libpng is not linked against libz and libm. This causes problems
+for packages that try to link against libpng without including "-lz -lm" in
+the linker flags.
+
+$LastChangedBy$
+$Date$
+
+diff -ur libpng-1.2.6rc1.orig/scripts/libpng.pc.in libpng-1.2.6rc1/scripts/libpng.pc.in
+--- libpng-1.2.6rc1.orig/scripts/libpng.pc.in	2002-10-03 06:32:33.000000000 -0500
++++ libpng-1.2.6rc1/scripts/libpng.pc.in	2004-03-14 10:29:13.000000000 -0600
+@@ -7,5 +7,5 @@
+ Name: libpng12
+ Description: Loads and saves PNG files
+ Version: 1.2.6
+-Libs: -L${libdir} -lpng12 -lz -lm
++Libs: -L${libdir} -lpng12
+ Cflags: -I${includedir}/libpng12
+diff -ur libpng-1.2.6rc1.orig/scripts/makefile.linux libpng-1.2.6rc1/scripts/makefile.linux
+--- libpng-1.2.6rc1.orig/scripts/makefile.linux	2002-10-03 06:32:34.000000000 -0500
++++ libpng-1.2.6rc1/scripts/makefile.linux	2004-03-14 10:31:21.000000000 -0600
+@@ -34,8 +34,9 @@
+ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+ 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
+ 
+-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
+-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
++LIBS=-lz -lm
++LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
++LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
+ 
+ RANLIB=ranlib
+ #RANLIB=echo
+@@ -86,7 +87,7 @@
+ 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ 	echo L_opts=\"-L$(LIBPATH)\"; \
+ 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
+-	echo libs=\"-lpng12 -lz -lm\"; \
++	echo libs=\"-lpng12\"; \
+ 	cat scripts/libpng-config-body.in ) > libpng-config
+ 	chmod +x libpng-config
+ 
+@@ -99,12 +100,12 @@
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
+ 	-o $(LIBNAME).so.$(PNGVER) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ libpng.so.3.$(PNGMIN): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,libpng.so.3 \
+ 	-o libpng.so.3.$(PNGMIN) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+ 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)

Deleted: trunk/patches/libpng-1.2.6rc1-link_to_proper_libs-1.patch
===================================================================
--- trunk/patches/libpng-1.2.6rc1-link_to_proper_libs-1.patch	2004-09-08 14:40:51 UTC (rev 2725)
+++ trunk/patches/libpng-1.2.6rc1-link_to_proper_libs-1.patch	2004-09-08 15:22:39 UTC (rev 2726)
@@ -1,60 +0,0 @@
-Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
-Date: 2004-08-05
-Initial Package Version: 1.2.6rc1
-Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
-Description: libpng is not linked against libz and libm. This causes problems
-for packages that try to link against libpng without including "-lz -lm" in
-the linker flags.
-
-$LastChangedBy$
-$Date$
-
-diff -ur libpng-1.2.6rc1.orig/scripts/libpng.pc.in libpng-1.2.6rc1/scripts/libpng.pc.in
---- libpng-1.2.6rc1.orig/scripts/libpng.pc.in	2002-10-03 06:32:33.000000000 -0500
-+++ libpng-1.2.6rc1/scripts/libpng.pc.in	2004-03-14 10:29:13.000000000 -0600
-@@ -7,5 +7,5 @@
- Name: libpng12
- Description: Loads and saves PNG files
- Version: 1.2.6rc1
--Libs: -L${libdir} -lpng12 -lz -lm
-+Libs: -L${libdir} -lpng12
- Cflags: -I${includedir}/libpng12
-diff -ur libpng-1.2.6rc1.orig/scripts/makefile.linux libpng-1.2.6rc1/scripts/makefile.linux
---- libpng-1.2.6rc1.orig/scripts/makefile.linux	2002-10-03 06:32:34.000000000 -0500
-+++ libpng-1.2.6rc1/scripts/makefile.linux	2004-03-14 10:31:21.000000000 -0600
-@@ -34,8 +34,9 @@
- CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
- 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
--LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
--LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LIBS=-lz -lm
-+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
-+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
- 
- RANLIB=ranlib
- #RANLIB=echo
-@@ -86,7 +87,7 @@
- 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- 	echo L_opts=\"-L$(LIBPATH)\"; \
- 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
--	echo libs=\"-lpng12 -lz -lm\"; \
-+	echo libs=\"-lpng12\"; \
- 	cat scripts/libpng-config-body.in ) > libpng-config
- 	chmod +x libpng-config
- 
-@@ -99,12 +100,12 @@
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
- 	-o $(LIBNAME).so.$(PNGVER) \
--	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- libpng.so.3.$(PNGMIN): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,libpng.so.3 \
- 	-o libpng.so.3.$(PNGMIN) \
--	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- pngtest: pngtest.o $(LIBNAME).so
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)




More information about the blfs-book mailing list