Merge commit 'ms/ppp-update'

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 63c6d4b3068df2ba38a39d0f27b25ed2bb8d19d9..9e77db173734733ce19b073f5046edb211f3ff65 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3129,7 +3129,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
+# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_MON is not set
 CONFIG_USB_WUSB=m

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index d527117945bd9299e1f92bf773d2ffce5f443af2..a43e6991de840aa74daf9c0a5f90df4bf6c358c3 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -2879,7 +2879,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
+# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_MON is not set
 CONFIG_USB_WUSB=m

diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng
index c1700a6c5f7b17f7d2adfa2d98740e965ca885a8..2b2ab107f377fd73c550fe0ee4f619cd5fdc6400 100644 (file)
--- a/config/rootfiles/common/libpng
+++ b/config/rootfiles/common/libpng
@@ -9,14 +9,14 @@
 #usr/lib/libpng.la
 usr/lib/libpng.so
 usr/lib/libpng.so.3
-usr/lib/libpng.so.3.12.0
+usr/lib/libpng.so.3.44.0
 #usr/lib/libpng12.a
 #usr/lib/libpng12.la
 usr/lib/libpng12.so
 usr/lib/libpng12.so.0
-usr/lib/libpng12.so.0.12.0
+usr/lib/libpng12.so.0.44.0
 #usr/lib/pkgconfig/libpng.pc
 #usr/lib/pkgconfig/libpng12.pc
-#usr/man/man3/libpng.3
-#usr/man/man3/libpngpf.3
-#usr/man/man5/png.5
+#usr/share/man/man3/libpng.3
+#usr/share/man/man3/libpngpf.3
+#usr/share/man/man5/png.5

diff --git a/config/rootfiles/core/39/filelists/libpng b/config/rootfiles/core/39/filelists/libpng
new file mode 120000 (symlink)
index 0000000..8ef96e2
--- /dev/null
+++ b/config/rootfiles/core/39/filelists/libpng
@@ -0,0 +1 @@
+../../../common/libpng
\ No newline at end of file

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 5a0ce0d2ddaca663a309b2f072941fdd4003f0ef..f38ed4e2af6559111fe2f45a7fd94ea65788af64 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.5.i586-full-core37.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core38.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/config/rootfiles/packages/libtiff b/config/rootfiles/packages/libtiff
index 097915d570ffb3f76b10dc9d6910ce2679c96b82..12de791779bd78c2480a37bc766c2660a597e2bf 100644 (file)
--- a/config/rootfiles/packages/libtiff
+++ b/config/rootfiles/packages/libtiff
@@ -14,6 +14,7 @@ usr/bin/tiff2ps
 usr/bin/tiff2rgba
 usr/bin/tiffcmp
 usr/bin/tiffcp
+usr/bin/tiffcrop
 usr/bin/tiffdither
 usr/bin/tiffdump
 usr/bin/tiffinfo
@@ -29,207 +30,213 @@ usr/bin/tiffsplit
 #usr/lib/libtiff.la
 usr/lib/libtiff.so
 usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.8.2
+usr/lib/libtiff.so.3.9.4
 #usr/lib/libtiffxx.a
 #usr/lib/libtiffxx.la
 usr/lib/libtiffxx.so
 usr/lib/libtiffxx.so.3
-usr/lib/libtiffxx.so.3.8.2
-#usr/man/man1/bmp2tiff.1
-#usr/man/man1/fax2ps.1
-#usr/man/man1/fax2tiff.1
-#usr/man/man1/gif2tiff.1
-#usr/man/man1/pal2rgb.1
-#usr/man/man1/ppm2tiff.1
-#usr/man/man1/ras2tiff.1
-#usr/man/man1/raw2tiff.1
-#usr/man/man1/rgb2ycbcr.1
-#usr/man/man1/sgi2tiff.1
-#usr/man/man1/thumbnail.1
-#usr/man/man1/tiff2bw.1
-#usr/man/man1/tiff2pdf.1
-#usr/man/man1/tiff2ps.1
-#usr/man/man1/tiff2rgba.1
-#usr/man/man1/tiffcmp.1
-#usr/man/man1/tiffcp.1
-#usr/man/man1/tiffdither.1
-#usr/man/man1/tiffdump.1
-#usr/man/man1/tiffgt.1
-#usr/man/man1/tiffinfo.1
-#usr/man/man1/tiffmedian.1
-#usr/man/man1/tiffset.1
-#usr/man/man1/tiffsplit.1
-#usr/man/man1/tiffsv.1
-#usr/man/man3/TIFFClose.3tiff
-#usr/man/man3/TIFFDataWidth.3tiff
-#usr/man/man3/TIFFError.3tiff
-#usr/man/man3/TIFFFlush.3tiff
-#usr/man/man3/TIFFGetField.3tiff
-#usr/man/man3/TIFFOpen.3tiff
-#usr/man/man3/TIFFPrintDirectory.3tiff
-#usr/man/man3/TIFFRGBAImage.3tiff
-#usr/man/man3/TIFFReadDirectory.3tiff
-#usr/man/man3/TIFFReadEncodedStrip.3tiff
-#usr/man/man3/TIFFReadEncodedTile.3tiff
-#usr/man/man3/TIFFReadRGBAImage.3tiff
-#usr/man/man3/TIFFReadRGBAStrip.3tiff
-#usr/man/man3/TIFFReadRGBATile.3tiff
-#usr/man/man3/TIFFReadRawStrip.3tiff
-#usr/man/man3/TIFFReadRawTile.3tiff
-#usr/man/man3/TIFFReadScanline.3tiff
-#usr/man/man3/TIFFReadTile.3tiff
-#usr/man/man3/TIFFSetDirectory.3tiff
-#usr/man/man3/TIFFSetField.3tiff
-#usr/man/man3/TIFFWarning.3tiff
-#usr/man/man3/TIFFWriteDirectory.3tiff
-#usr/man/man3/TIFFWriteEncodedStrip.3tiff
-#usr/man/man3/TIFFWriteEncodedTile.3tiff
-#usr/man/man3/TIFFWriteRawStrip.3tiff
-#usr/man/man3/TIFFWriteRawTile.3tiff
-#usr/man/man3/TIFFWriteScanline.3tiff
-#usr/man/man3/TIFFWriteTile.3tiff
-#usr/man/man3/TIFFbuffer.3tiff
-#usr/man/man3/TIFFcodec.3tiff
-#usr/man/man3/TIFFcolor.3tiff
-#usr/man/man3/TIFFmemory.3tiff
-#usr/man/man3/TIFFquery.3tiff
-#usr/man/man3/TIFFsize.3tiff
-#usr/man/man3/TIFFstrip.3tiff
-#usr/man/man3/TIFFswab.3tiff
-#usr/man/man3/TIFFtile.3tiff
-#usr/man/man3/libtiff.3tiff
-#usr/share/doc/tiff-3.8.2
-#usr/share/doc/tiff-3.8.2/COPYRIGHT
-#usr/share/doc/tiff-3.8.2/ChangeLog
-#usr/share/doc/tiff-3.8.2/README
-#usr/share/doc/tiff-3.8.2/RELEASE-DATE
-#usr/share/doc/tiff-3.8.2/TODO
-#usr/share/doc/tiff-3.8.2/VERSION
-#usr/share/doc/tiff-3.8.2/html
-#usr/share/doc/tiff-3.8.2/html/TIFFTechNote2.html
-#usr/share/doc/tiff-3.8.2/html/addingtags.html
-#usr/share/doc/tiff-3.8.2/html/bugs.html
-#usr/share/doc/tiff-3.8.2/html/build.html
-#usr/share/doc/tiff-3.8.2/html/contrib.html
-#usr/share/doc/tiff-3.8.2/html/document.html
-#usr/share/doc/tiff-3.8.2/html/images
-#usr/share/doc/tiff-3.8.2/html/images.html
-#usr/share/doc/tiff-3.8.2/html/images/back.gif
-#usr/share/doc/tiff-3.8.2/html/images/bali.jpg
-#usr/share/doc/tiff-3.8.2/html/images/cat.gif
-#usr/share/doc/tiff-3.8.2/html/images/cover.jpg
-#usr/share/doc/tiff-3.8.2/html/images/cramps.gif
-#usr/share/doc/tiff-3.8.2/html/images/dave.gif
-#usr/share/doc/tiff-3.8.2/html/images/info.gif
-#usr/share/doc/tiff-3.8.2/html/images/jello.jpg
-#usr/share/doc/tiff-3.8.2/html/images/jim.gif
-#usr/share/doc/tiff-3.8.2/html/images/note.gif
-#usr/share/doc/tiff-3.8.2/html/images/oxford.gif
-#usr/share/doc/tiff-3.8.2/html/images/quad.jpg
-#usr/share/doc/tiff-3.8.2/html/images/ring.gif
-#usr/share/doc/tiff-3.8.2/html/images/smallliz.jpg
-#usr/share/doc/tiff-3.8.2/html/images/strike.gif
-#usr/share/doc/tiff-3.8.2/html/images/warning.gif
-#usr/share/doc/tiff-3.8.2/html/index.html
-#usr/share/doc/tiff-3.8.2/html/internals.html
-#usr/share/doc/tiff-3.8.2/html/intro.html
-#usr/share/doc/tiff-3.8.2/html/libtiff.html
-#usr/share/doc/tiff-3.8.2/html/man
-#usr/share/doc/tiff-3.8.2/html/man/TIFFClose.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFDataWidth.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFError.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFFlush.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFGetField.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFOpen.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFPrintDirectory.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFRGBAImage.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadDirectory.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadEncodedStrip.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadEncodedTile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadRGBAImage.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadRGBAStrip.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadRGBATile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadRawStrip.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadRawTile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadScanline.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFReadTile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFSetDirectory.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFSetField.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWarning.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteDirectory.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteEncodedStrip.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteEncodedTile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteRawStrip.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteRawTile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteScanline.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFWriteTile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFbuffer.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFcodec.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFcolor.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFmemory.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFquery.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFsize.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFstrip.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFswab.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/TIFFtile.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/fax2ps.1.html
-#usr/share/doc/tiff-3.8.2/html/man/fax2tiff.1.html
-#usr/share/doc/tiff-3.8.2/html/man/gif2tiff.1.html
-#usr/share/doc/tiff-3.8.2/html/man/index.html
-#usr/share/doc/tiff-3.8.2/html/man/libtiff.3tiff.html
-#usr/share/doc/tiff-3.8.2/html/man/pal2rgb.1.html
-#usr/share/doc/tiff-3.8.2/html/man/ppm2tiff.1.html
-#usr/share/doc/tiff-3.8.2/html/man/ras2tiff.1.html
-#usr/share/doc/tiff-3.8.2/html/man/raw2tiff.1.html
-#usr/share/doc/tiff-3.8.2/html/man/rgb2ycbcr.1.html
-#usr/share/doc/tiff-3.8.2/html/man/sgi2tiff.1.html
-#usr/share/doc/tiff-3.8.2/html/man/thumbnail.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiff2bw.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiff2pdf.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiff2ps.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiff2rgba.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffcmp.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffcp.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffdither.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffdump.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffgt.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffinfo.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffmedian.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffset.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffsplit.1.html
-#usr/share/doc/tiff-3.8.2/html/man/tiffsv.1.html
-#usr/share/doc/tiff-3.8.2/html/misc.html
-#usr/share/doc/tiff-3.8.2/html/support.html
-#usr/share/doc/tiff-3.8.2/html/tools.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta007.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta016.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta018.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta024.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta028.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta029.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta031.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta032.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta033.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta034.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta035.html
-#usr/share/doc/tiff-3.8.2/html/v3.4beta036.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.1.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.2.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.3.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.4.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.5.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.6-beta.html
-#usr/share/doc/tiff-3.8.2/html/v3.5.7.html
-#usr/share/doc/tiff-3.8.2/html/v3.6.0.html
-#usr/share/doc/tiff-3.8.2/html/v3.6.1.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.0.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.0alpha.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.0beta.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.0beta2.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.1.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.2.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.3.html
-#usr/share/doc/tiff-3.8.2/html/v3.7.4.html
-#usr/share/doc/tiff-3.8.2/html/v3.8.0.html
-#usr/share/doc/tiff-3.8.2/html/v3.8.1.html
-#usr/share/doc/tiff-3.8.2/html/v3.8.2.html
+usr/lib/libtiffxx.so.3.9.4
+#usr/share/doc/tiff-3.9.4
+#usr/share/doc/tiff-3.9.4/COPYRIGHT
+#usr/share/doc/tiff-3.9.4/ChangeLog
+#usr/share/doc/tiff-3.9.4/README
+#usr/share/doc/tiff-3.9.4/README.vms
+#usr/share/doc/tiff-3.9.4/RELEASE-DATE
+#usr/share/doc/tiff-3.9.4/TODO
+#usr/share/doc/tiff-3.9.4/VERSION
+#usr/share/doc/tiff-3.9.4/html
+#usr/share/doc/tiff-3.9.4/html/TIFFTechNote2.html
+#usr/share/doc/tiff-3.9.4/html/addingtags.html
+#usr/share/doc/tiff-3.9.4/html/bugs.html
+#usr/share/doc/tiff-3.9.4/html/build.html
+#usr/share/doc/tiff-3.9.4/html/contrib.html
+#usr/share/doc/tiff-3.9.4/html/document.html
+#usr/share/doc/tiff-3.9.4/html/images
+#usr/share/doc/tiff-3.9.4/html/images.html
+#usr/share/doc/tiff-3.9.4/html/images/back.gif
+#usr/share/doc/tiff-3.9.4/html/images/bali.jpg
+#usr/share/doc/tiff-3.9.4/html/images/cat.gif
+#usr/share/doc/tiff-3.9.4/html/images/cover.jpg
+#usr/share/doc/tiff-3.9.4/html/images/cramps.gif
+#usr/share/doc/tiff-3.9.4/html/images/dave.gif
+#usr/share/doc/tiff-3.9.4/html/images/info.gif
+#usr/share/doc/tiff-3.9.4/html/images/jello.jpg
+#usr/share/doc/tiff-3.9.4/html/images/jim.gif
+#usr/share/doc/tiff-3.9.4/html/images/note.gif
+#usr/share/doc/tiff-3.9.4/html/images/oxford.gif
+#usr/share/doc/tiff-3.9.4/html/images/quad.jpg
+#usr/share/doc/tiff-3.9.4/html/images/ring.gif
+#usr/share/doc/tiff-3.9.4/html/images/smallliz.jpg
+#usr/share/doc/tiff-3.9.4/html/images/strike.gif
+#usr/share/doc/tiff-3.9.4/html/images/warning.gif
+#usr/share/doc/tiff-3.9.4/html/index.html
+#usr/share/doc/tiff-3.9.4/html/internals.html
+#usr/share/doc/tiff-3.9.4/html/intro.html
+#usr/share/doc/tiff-3.9.4/html/libtiff.html
+#usr/share/doc/tiff-3.9.4/html/man
+#usr/share/doc/tiff-3.9.4/html/man/TIFFClose.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFDataWidth.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFError.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFFlush.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFGetField.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFOpen.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFPrintDirectory.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFRGBAImage.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadDirectory.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadEncodedStrip.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadEncodedTile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBAImage.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBAStrip.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBATile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRawStrip.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRawTile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadScanline.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFReadTile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFSetDirectory.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFSetField.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWarning.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteDirectory.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteEncodedStrip.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteEncodedTile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteRawStrip.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteRawTile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteScanline.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteTile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFbuffer.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFcodec.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFcolor.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFmemory.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFquery.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFsize.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFstrip.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFswab.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/TIFFtile.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/fax2ps.1.html
+#usr/share/doc/tiff-3.9.4/html/man/fax2tiff.1.html
+#usr/share/doc/tiff-3.9.4/html/man/gif2tiff.1.html
+#usr/share/doc/tiff-3.9.4/html/man/index.html
+#usr/share/doc/tiff-3.9.4/html/man/libtiff.3tiff.html
+#usr/share/doc/tiff-3.9.4/html/man/pal2rgb.1.html
+#usr/share/doc/tiff-3.9.4/html/man/ppm2tiff.1.html
+#usr/share/doc/tiff-3.9.4/html/man/ras2tiff.1.html
+#usr/share/doc/tiff-3.9.4/html/man/raw2tiff.1.html
+#usr/share/doc/tiff-3.9.4/html/man/rgb2ycbcr.1.html
+#usr/share/doc/tiff-3.9.4/html/man/sgi2tiff.1.html
+#usr/share/doc/tiff-3.9.4/html/man/thumbnail.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiff2bw.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiff2pdf.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiff2ps.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiff2rgba.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffcmp.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffcp.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffcrop.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffdither.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffdump.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffgt.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffinfo.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffmedian.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffset.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffsplit.1.html
+#usr/share/doc/tiff-3.9.4/html/man/tiffsv.1.html
+#usr/share/doc/tiff-3.9.4/html/misc.html
+#usr/share/doc/tiff-3.9.4/html/support.html
+#usr/share/doc/tiff-3.9.4/html/tools.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta007.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta016.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta018.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta024.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta028.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta029.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta031.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta032.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta033.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta034.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta035.html
+#usr/share/doc/tiff-3.9.4/html/v3.4beta036.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.1.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.2.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.3.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.4.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.5.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.6-beta.html
+#usr/share/doc/tiff-3.9.4/html/v3.5.7.html
+#usr/share/doc/tiff-3.9.4/html/v3.6.0.html
+#usr/share/doc/tiff-3.9.4/html/v3.6.1.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.0.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.0alpha.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.0beta.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.0beta2.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.1.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.2.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.3.html
+#usr/share/doc/tiff-3.9.4/html/v3.7.4.html
+#usr/share/doc/tiff-3.9.4/html/v3.8.0.html
+#usr/share/doc/tiff-3.9.4/html/v3.8.1.html
+#usr/share/doc/tiff-3.9.4/html/v3.8.2.html
+#usr/share/doc/tiff-3.9.4/html/v3.9.0beta.html
+#usr/share/doc/tiff-3.9.4/html/v3.9.1.html
+#usr/share/doc/tiff-3.9.4/html/v3.9.2.html
+#usr/share/man/man1/bmp2tiff.1
+#usr/share/man/man1/fax2ps.1
+#usr/share/man/man1/fax2tiff.1
+#usr/share/man/man1/gif2tiff.1
+#usr/share/man/man1/pal2rgb.1
+#usr/share/man/man1/ppm2tiff.1
+#usr/share/man/man1/ras2tiff.1
+#usr/share/man/man1/raw2tiff.1
+#usr/share/man/man1/rgb2ycbcr.1
+#usr/share/man/man1/sgi2tiff.1
+#usr/share/man/man1/thumbnail.1
+#usr/share/man/man1/tiff2bw.1
+#usr/share/man/man1/tiff2pdf.1
+#usr/share/man/man1/tiff2ps.1
+#usr/share/man/man1/tiff2rgba.1
+#usr/share/man/man1/tiffcmp.1
+#usr/share/man/man1/tiffcp.1
+#usr/share/man/man1/tiffcrop.1
+#usr/share/man/man1/tiffdither.1
+#usr/share/man/man1/tiffdump.1
+#usr/share/man/man1/tiffgt.1
+#usr/share/man/man1/tiffinfo.1
+#usr/share/man/man1/tiffmedian.1
+#usr/share/man/man1/tiffset.1
+#usr/share/man/man1/tiffsplit.1
+#usr/share/man/man1/tiffsv.1
+#usr/share/man/man3/TIFFClose.3tiff
+#usr/share/man/man3/TIFFDataWidth.3tiff
+#usr/share/man/man3/TIFFError.3tiff
+#usr/share/man/man3/TIFFFlush.3tiff
+#usr/share/man/man3/TIFFGetField.3tiff
+#usr/share/man/man3/TIFFOpen.3tiff
+#usr/share/man/man3/TIFFPrintDirectory.3tiff
+#usr/share/man/man3/TIFFRGBAImage.3tiff
+#usr/share/man/man3/TIFFReadDirectory.3tiff
+#usr/share/man/man3/TIFFReadEncodedStrip.3tiff
+#usr/share/man/man3/TIFFReadEncodedTile.3tiff
+#usr/share/man/man3/TIFFReadRGBAImage.3tiff
+#usr/share/man/man3/TIFFReadRGBAStrip.3tiff
+#usr/share/man/man3/TIFFReadRGBATile.3tiff
+#usr/share/man/man3/TIFFReadRawStrip.3tiff
+#usr/share/man/man3/TIFFReadRawTile.3tiff
+#usr/share/man/man3/TIFFReadScanline.3tiff
+#usr/share/man/man3/TIFFReadTile.3tiff
+#usr/share/man/man3/TIFFSetDirectory.3tiff
+#usr/share/man/man3/TIFFSetField.3tiff
+#usr/share/man/man3/TIFFWarning.3tiff
+#usr/share/man/man3/TIFFWriteDirectory.3tiff
+#usr/share/man/man3/TIFFWriteEncodedStrip.3tiff
+#usr/share/man/man3/TIFFWriteEncodedTile.3tiff
+#usr/share/man/man3/TIFFWriteRawStrip.3tiff
+#usr/share/man/man3/TIFFWriteRawTile.3tiff
+#usr/share/man/man3/TIFFWriteScanline.3tiff
+#usr/share/man/man3/TIFFWriteTile.3tiff
+#usr/share/man/man3/TIFFbuffer.3tiff
+#usr/share/man/man3/TIFFcodec.3tiff
+#usr/share/man/man3/TIFFcolor.3tiff
+#usr/share/man/man3/TIFFmemory.3tiff
+#usr/share/man/man3/TIFFquery.3tiff
+#usr/share/man/man3/TIFFsize.3tiff
+#usr/share/man/man3/TIFFstrip.3tiff
+#usr/share/man/man3/TIFFswab.3tiff
+#usr/share/man/man3/TIFFtile.3tiff
+#usr/share/man/man3/libtiff.3tiff

diff --git a/config/rootfiles/packages/minicom b/config/rootfiles/packages/minicom
new file mode 100644 (file)
index 0000000..53266e6
--- /dev/null
+++ b/config/rootfiles/packages/minicom
@@ -0,0 +1,26 @@
+usr/bin/ascii-xfr
+usr/bin/minicom
+usr/bin/runscript
+usr/bin/xminicom
+#usr/share/locale/cs/LC_MESSAGES/minicom.mo
+#usr/share/locale/da/LC_MESSAGES/minicom.mo
+#usr/share/locale/de/LC_MESSAGES/minicom.mo
+#usr/share/locale/es/LC_MESSAGES/minicom.mo
+#usr/share/locale/fi/LC_MESSAGES/minicom.mo
+#usr/share/locale/fr/LC_MESSAGES/minicom.mo
+#usr/share/locale/hu/LC_MESSAGES/minicom.mo
+#usr/share/locale/id/LC_MESSAGES/minicom.mo
+#usr/share/locale/ja/LC_MESSAGES/minicom.mo
+#usr/share/locale/nb/LC_MESSAGES/minicom.mo
+#usr/share/locale/pl/LC_MESSAGES/minicom.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/minicom.mo
+#usr/share/locale/ro/LC_MESSAGES/minicom.mo
+#usr/share/locale/ru/LC_MESSAGES/minicom.mo
+#usr/share/locale/rw/LC_MESSAGES/minicom.mo
+#usr/share/locale/sv/LC_MESSAGES/minicom.mo
+#usr/share/locale/vi/LC_MESSAGES/minicom.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/minicom.mo
+#usr/share/man/man1/ascii-xfr.1
+#usr/share/man/man1/minicom.1
+#usr/share/man/man1/runscript.1
+#usr/share/man/man1/xminicom.1

diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
new file mode 100644 (file)
index 0000000..29f1177
--- /dev/null
+++ b/config/rootfiles/packages/openvmtools
@@ -0,0 +1,39 @@
+etc/rc.d/init.d/openvmtools
+etc/rc.d/rc0.d/K01openvmtools
+etc/rc.d/rc3.d/S60openvmtools
+etc/rc.d/rc6.d/K01openvmtools
+etc/vmware-tools
+etc/vmware-tools/plugins
+etc/vmware-tools/poweroff-vm-default
+etc/vmware-tools/poweron-vm-default
+etc/vmware-tools/resume-vm-default
+etc/vmware-tools/suspend-vm-default
+etc/vmware-tools/vm-support
+sbin/mount.vmhgfs
+usr/bin/vmtoolsd
+usr/bin/vmware-checkvm
+usr/bin/vmware-hgfsclient
+usr/bin/vmware-rpctool
+usr/bin/vmware-toolbox-cmd
+usr/bin/vmware-vmblock-fuse
+usr/bin/vmware-xferlogs
+usr/lib/libguestlib.a
+usr/lib/libguestlib.la
+usr/lib/libguestlib.so
+usr/lib/libguestlib.so.0
+usr/lib/libguestlib.so.0.0.0
+usr/lib/libvmtools.a
+usr/lib/libvmtools.la
+usr/lib/libvmtools.so
+usr/lib/libvmtools.so.0
+usr/lib/libvmtools.so.0.0.0
+usr/lib/open-vm-tools
+usr/lib/open-vm-tools/plugins
+usr/lib/open-vm-tools/plugins/vmsvc
+usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
+usr/lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so
+usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
+usr/lib/open-vm-tools/plugins/vmsvc/libvix.so
+usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
+usr/sbin/mount.vmhgfs

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index acde82953eb042a1f9f2c008043e69b6ef08281b..ee4aa7305bbb62ca829fc6b516cbf767b4570a76 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -185,6 +185,7 @@
 * liboping-1.3.4
 * libpcap-1.0.0
 * libpng-1.2.12
+* libpng-1.2.44
 * libpri-1.4.10.2
 * libsafe_2.0-16
 * libshout-2.2.2
@@ -256,7 +257,7 @@
 * nut-2.4.3
 * ocaml-3.09.2
 * oinkmaster-2.0
-* open-vm-tools-2009.05.22-167859
+* open-vm-tools-8.4.2-261024
 * openldap-2.3.20
 * openmailadmin-1.0.0
 * openssh-5.4p1
@@ -333,6 +334,7 @@
 * texinfo-4.8
 * tftp-hpa-0.48
 * tiff-3.8.2
+* tiff-3.9.4
 * traceroute-2.0.12
 * tripwire-2.4.1.2
 * tunctl

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 8c7584849299d74607a474817f188216ee863768..44777628031e473db3459acfb3e6a1f1fef06bac 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.5.i586-full-core37.iso.torrent
+DL_FILE    = ipfire-2.7.i586-full-core38.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2f984c777a487f5f7642f3abbe6aee31
+$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863
 
 install : $(TARGET)
 

diff --git a/lfs/libpng b/lfs/libpng
index 3aad2cc64cd16fdef68ef0aa5d8ed1932c962923..60b25a009da67da200d8c8d3df42d7f80a89cf2d 100644 (file)
--- a/lfs/libpng
+++ b/lfs/libpng
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.2.12
+VER        = 1.2.44
 
 THISAPP    = libpng-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e82f39e46aac34a1ca559c79322979be
+$(DL_FILE)_MD5 = 098ab673ab74015978db98667febc4a9
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/lfs/libtiff b/lfs/libtiff
index 73e53cbafcbfeb6745389d23e6b49ee860dd9c42..f5e4d578b7d35cd79dec4b730e8a522314fdcce2 100644 (file)
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.8.2
+VER        = 3.9.4
 
 THISAPP    = tiff-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtiff
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fbb6f446ea4ed18955e2714934e5b698
+$(DL_FILE)_MD5 = 2006c1bdd12644dbf02956955175afd6
 
 install : $(TARGET)
 

diff --git a/lfs/minicom b/lfs/minicom
new file mode 100644 (file)
index 0000000..8af78e2
--- /dev/null
+++ b/lfs/minicom
@@ -0,0 +1,86 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.4
+
+THISAPP    = minicom-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = minicom
+PAK_VER    = 0
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 700976a3c2dcc8bbd50ab9bb1c08837b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && \
+               ./configure \
+                       --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/open-vm-tools b/lfs/openvmtools
similarity index 89%
rename from lfs/open-vm-tools
rename to lfs/openvmtools
index 214193ab20d9d39c380287f2629bb9a3f3998da9..c708268f0795d4fe38a43a0ac5597e422f979d89 100644 (file)
--- a/lfs/open-vm-tools
+++ b/lfs/openvmtools
@@ -24,13 +24,16 @@
 
 include Config
 
-VER        = 2009.05.22-167859
+VER        = 8.4.2-261024
 
 THISAPP    = open-vm-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = openvmtools
+PAK_VER    = 0
+DEPS       = "glib"
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cc1c139d2d927952be93397d928f9d6c
+$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486
 
 install : $(TARGET)
 
@@ -50,6 +53,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist:
+       @$(PAK) 
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -78,5 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --without-kernel-modules
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
+       ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
+       ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
+       rm -rvf /usr/etc/pam.d /usr/share/openvmtools
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 03806c824b24e50d57277911e7e64d79b5870ae5..c4511edffaa913975e10bf6d713ce21a768a3e53 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -624,7 +624,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake open-vm-tools
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -640,6 +640,7 @@ buildipfire() {
   ipfiremake mdadm
   ipfiremake eject
   ipfiremake pound
+  ipfiremake minicom
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools
new file mode 100755 (executable)
index 0000000..c1588e1
--- /dev/null
+++ b/src/initscripts/init.d/openvmtools
@@ -0,0 +1,64 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/
+#
+# Description : init-script for open-vm-tools
+#
+# Authors     : earl
+#
+# Version     : 00.01
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+       if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null
+               then
+               boot_mesg "vmtoolsd is running..."
+               echo_warning
+       else
+               if /usr/bin/vmware-checkvm > /dev/null 2>&1; then
+                       boot_mesg "Starting..."
+                       /usr/bin/vmtoolsd &
+                       echo_ok
+               else
+                       boot_mesg "IPFire is not running in a virtual machine." 
+                       echo_failure
+               fi
+       fi
+       ;;
+       
+       stop)
+       if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null
+               then
+               boot_mesg "Stopping..."
+               killall  /usr/bin/vmtoolsd > /dev/null
+               echo_ok
+       else
+               boot_mesg "vmtoolsd is not running..."  
+               echo_warning
+       fi
+       ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /usr/bin/vmtoolsd
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/