From wbonnet at users.sourceforge.net Sun Mar 1 11:38:34 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 01 Mar 2009 10:38:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3543] csw/mgar/pkg/java Message-ID: Revision: 3543 http://gar.svn.sourceforge.net/gar/?rev=3543&view=rev Author: wbonnet Date: 2009-03-01 10:38:34 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Create tags for packages released in testing Added Paths: ----------- csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajcchain/commons_chain-1.2,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccli/commons_cli-1.1,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccodec/commons_codec-1.3,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccollections/commons_collect-3.2.1,REV=2009.02.24-testing-b1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 1 11:43:37 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 01 Mar 2009 10:43:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3544] csw/mgar/pkg/java Message-ID: Revision: 3544 http://gar.svn.sourceforge.net/gar/?rev=3544&view=rev Author: wbonnet Date: 2009-03-01 10:43:36 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Create tags for packages released in testing Added Paths: ----------- csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccodec/tags/commons_codec-1.3,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-testing-b1/ Removed Paths: ------------- csw/mgar/pkg/java/ajcchain/commons_chain-1.2,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccli/commons_cli-1.1,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccodec/commons_codec-1.3,REV=2009.02.24-testing-b1/ csw/mgar/pkg/java/ajccollections/commons_collect-3.2.1,REV=2009.02.24-testing-b1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 1 11:48:59 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 01 Mar 2009 10:48:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[3545] csw/mgar/pkg/x11 Message-ID: Revision: 3545 http://gar.svn.sourceforge.net/gar/?rev=3545&view=rev Author: wbonnet Date: 2009-03-01 10:48:59 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Create tags for packages released in testing Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/checksums csw/mgar/pkg/x11/renderproto/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/kbproto/tags/kbproto-1.0.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/libpthread-stubs/tags/libpthread-stubs-0.1,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/renderproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/xcb-proto/tags/xcbproto-1.4,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/xextproto/tags/xextproto-7.0.5,REV=2009.02.25-testing-b1/ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.14,REV=2009.02.25-testing-b1/ Modified: csw/mgar/pkg/x11/renderproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-02-28 21:42:43 UTC (rev 3542) +++ csw/mgar/pkg/x11/renderproto/tags/renderproto-0.9.3,REV=2009.02.25-testing-b1/checksums 2009-03-01 10:48:59 UTC (rev 3545) @@ -1,3 +1,2 @@ ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz -7ed3eb5869a828ed11fd90b7f3c2e70e download/CSWrenderproto.gspec -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +4efab345f11fb4991984f1a429f534ce download/CSWrenderproto.gspec Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-03-01 10:43:36 UTC (rev 3544) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-03-01 10:48:59 UTC (rev 3545) @@ -1,3 +1,2 @@ ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz -7ed3eb5869a828ed11fd90b7f3c2e70e download/CSWrenderproto.gspec -ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz +4efab345f11fb4991984f1a429f534ce download/CSWrenderproto.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 1 11:51:03 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 01 Mar 2009 10:51:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3546] csw/mgar/pkg/firefox/branches/firefox3-packaging/ Message-ID: Revision: 3546 http://gar.svn.sourceforge.net/gar/?rev=3546&view=rev Author: wbonnet Date: 2009-03-01 10:51:03 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Create branch for FF3 packaging Added Paths: ----------- csw/mgar/pkg/firefox/branches/firefox3-packaging/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Sun Mar 1 15:00:04 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Sun, 01 Mar 2009 14:00:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[3547] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 3547 http://gar.svn.sourceforge.net/gar/?rev=3547&view=rev Author: harpchad Date: 2009-03-01 14:00:04 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Update to patch 128 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-03-01 10:51:03 UTC (rev 3546) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-03-01 14:00:04 UTC (rev 3547) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 102 +PATCHREV = 128 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php @@ -42,8 +42,6 @@ BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" -#GTK2 needs 64-bit -#BUILD64 = 1 PATCHDIRLEVEL = 0 @@ -59,33 +57,6 @@ # Note: Tests require controlling terminal TEST_TARGET = test -ISAEXEC_EXCLUDE_FILES = /opt/csw/bin/gview -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gvim -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/rgvim -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/rgview -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gvimdiff -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gvimtutor -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/evim -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/eview - -MERGE_EXCLUDE_FILES_isa-sparcv9 = /opt/csw/bin/sparcv9/gview -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/rgvim-x11 -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/rgview -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/eview -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/evim-x11 -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/gvim-x11diff -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/gvim-x11 -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/gvim-x11tutor - -MERGE_EXCLUDE_FILES_isa-amd64 = /opt/csw/bin/amd64/gview -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/rgvim-x11 -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/rgview -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/eview -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/evim-x11 -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/gvim-x11diff -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/gvim-x11 -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/gvim-x11tutor - include gar/category.mk post-install-isa-sparcv8 post-install-isa-i386: Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2009-03-01 10:51:03 UTC (rev 3546) +++ csw/mgar/pkg/gvim/trunk/checksums 2009-03-01 14:00:04 UTC (rev 3547) @@ -1,3 +1,8 @@ +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop +73612b6658c597ee478abf27a0a89ed5 download/COPYING 7c2dc4a956cf315e546e347bc349968c download/7.2.001 7f16f80814f1e071a689806c2056b39d download/7.2.002 0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 @@ -100,10 +105,30 @@ 15dacd715d6f8c655265bbf77ebaddd4 download/7.2.100 65e59923311b136306284319521d70d7 download/7.2.101 42e2274c6a3152279720d8623f7916ad download/7.2.102 -6619235ca793edf41831be1b1f9f63db download/fix-alignment64-spell.c.diff -47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop -35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +654ba716e77d092c1c314fed18c7486d download/7.2.103 +b839c2c957eb3bb7511ace0b61d5d5fe download/7.2.104 +7f37ad0b1573be8bc39a817a21422a4e download/7.2.105 +4801df8c2833a683cd1b2a5870565e41 download/7.2.106 +e6801b619d40efe81428399e26e0486f download/7.2.107 +76f17428d216ec6b29036e22397c2765 download/7.2.108 +db97daa4f1e56440a988e7f5272997c7 download/7.2.109 +b8752c88429f869dec05232db89018e2 download/7.2.110 +e8cdc1e862b60215c12265e44b38239d download/7.2.111 +e933dd778c6f8687cf1f9f3e550e6cc0 download/7.2.112 +861729d9d4dc422e45c22bd8e006fc32 download/7.2.113 +5da3a29b3184af1780a82499343e7587 download/7.2.114 +b35c7b1cfa2a5f7b45829cd09ac27b7a download/7.2.115 +1355cc34fbc7be7eb48fa777e8f49dfb download/7.2.116 +8b9c839ec7448691b0a88475f0d0d4f9 download/7.2.117 +74d97a563ec1b1f1606705097396c391 download/7.2.118 +2ddd84423b902a2b3594c64c567be0b4 download/7.2.119 +5394e442f011d47b6d69a7b03984cdf4 download/7.2.120 +6bdb5e63ca3d79d3dcb7127e14ae3949 download/7.2.121 +36554c0103cafc8759f3e71ccd56c56f download/7.2.122 +841c74d1f3cb8380fa5713d5b9ca2c98 download/7.2.123 +2489ebcb72280dd50b8756e4ab7d36ed download/7.2.124 +10b15d637133b73d825650363d863b58 download/7.2.125 +b31534667bb741e21479b1e3757c9e21 download/7.2.126 +71e87e78bea69d8876ff7f6d824c8986 download/7.2.127 +21da01d371757282bfd402ddd91005ba download/7.2.128 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch -73612b6658c597ee478abf27a0a89ed5 download/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Sun Mar 1 15:01:03 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Sun, 01 Mar 2009 14:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3548] csw/mgar/pkg/vim/trunk Message-ID: Revision: 3548 http://gar.svn.sourceforge.net/gar/?rev=3548&view=rev Author: harpchad Date: 2009-03-01 14:01:03 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Update to patch 128 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2009-03-01 14:00:04 UTC (rev 3547) +++ csw/mgar/pkg/vim/trunk/Makefile 2009-03-01 14:01:03 UTC (rev 3548) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 102 +PATCHREV = 128 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php @@ -34,7 +34,6 @@ PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) PATCHFILES += vimtutor.patch -PATCHFILES += fix-alignment64-spell.c.diff WORKSRC = $(WORKDIR)/$(GARNAME)$(subst .,,$(DISTVERSION)) @@ -51,8 +50,6 @@ BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim" BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim72" -#Removed per request -#BUILD64 = 1 PATCHDIRLEVEL = 0 @@ -61,27 +58,6 @@ PKGFILES_CSWvimrt = /opt/csw/share/.* -ISAEXEC_EXCLUDE_FILES = /opt/csw/bin/view -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/rvim -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/rview -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/vimdiff -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/ex -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/vimtutor - -MERGE_EXCLUDE_FILES_isa-sparcv9 = /opt/csw/bin/sparcv9/view -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/rvim -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/rview -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/vimdiff -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/ex -MERGE_EXCLUDE_FILES_isa-sparcv9 += /opt/csw/bin/sparcv9/vimtutor - -MERGE_EXCLUDE_FILES_isa-amd64 = /opt/csw/bin/amd64/view -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/rvim -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/rview -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/vimdiff -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/ex -MERGE_EXCLUDE_FILES_isa-amd64 += /opt/csw/bin/amd64/vimtutor - # Note: Tests require controlling terminal TEST_TARGET = test Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2009-03-01 14:00:04 UTC (rev 3547) +++ csw/mgar/pkg/vim/trunk/checksums 2009-03-01 14:01:03 UTC (rev 3548) @@ -1,3 +1,10 @@ +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +f31314c40819d3414d77ea286770c17f download/vimrc +1965bc951c0a190faaa665996b1b287e download/vimrc.tiny +80304427884b8b78134bc7c7c9097679 download/gvimrc +73612b6658c597ee478abf27a0a89ed5 download/COPYING 7c2dc4a956cf315e546e347bc349968c download/7.2.001 7f16f80814f1e071a689806c2056b39d download/7.2.002 0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 @@ -100,12 +107,30 @@ 15dacd715d6f8c655265bbf77ebaddd4 download/7.2.100 65e59923311b136306284319521d70d7 download/7.2.101 42e2274c6a3152279720d8623f7916ad download/7.2.102 -73612b6658c597ee478abf27a0a89ed5 download/COPYING -6619235ca793edf41831be1b1f9f63db download/fix-alignment64-spell.c.diff -80304427884b8b78134bc7c7c9097679 download/gvimrc -35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz -d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz -f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 -f31314c40819d3414d77ea286770c17f download/vimrc -1965bc951c0a190faaa665996b1b287e download/vimrc.tiny +654ba716e77d092c1c314fed18c7486d download/7.2.103 +b839c2c957eb3bb7511ace0b61d5d5fe download/7.2.104 +7f37ad0b1573be8bc39a817a21422a4e download/7.2.105 +4801df8c2833a683cd1b2a5870565e41 download/7.2.106 +e6801b619d40efe81428399e26e0486f download/7.2.107 +76f17428d216ec6b29036e22397c2765 download/7.2.108 +db97daa4f1e56440a988e7f5272997c7 download/7.2.109 +b8752c88429f869dec05232db89018e2 download/7.2.110 +e8cdc1e862b60215c12265e44b38239d download/7.2.111 +e933dd778c6f8687cf1f9f3e550e6cc0 download/7.2.112 +861729d9d4dc422e45c22bd8e006fc32 download/7.2.113 +5da3a29b3184af1780a82499343e7587 download/7.2.114 +b35c7b1cfa2a5f7b45829cd09ac27b7a download/7.2.115 +1355cc34fbc7be7eb48fa777e8f49dfb download/7.2.116 +8b9c839ec7448691b0a88475f0d0d4f9 download/7.2.117 +74d97a563ec1b1f1606705097396c391 download/7.2.118 +2ddd84423b902a2b3594c64c567be0b4 download/7.2.119 +5394e442f011d47b6d69a7b03984cdf4 download/7.2.120 +6bdb5e63ca3d79d3dcb7127e14ae3949 download/7.2.121 +36554c0103cafc8759f3e71ccd56c56f download/7.2.122 +841c74d1f3cb8380fa5713d5b9ca2c98 download/7.2.123 +2489ebcb72280dd50b8756e4ab7d36ed download/7.2.124 +10b15d637133b73d825650363d863b58 download/7.2.125 +b31534667bb741e21479b1e3757c9e21 download/7.2.126 +71e87e78bea69d8876ff7f6d824c8986 download/7.2.127 +21da01d371757282bfd402ddd91005ba download/7.2.128 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 1 20:25:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 01 Mar 2009 19:25:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[3549] csw/mgar/pkg/firefox Message-ID: Revision: 3549 http://gar.svn.sourceforge.net/gar/?rev=3549&view=rev Author: wbonnet Date: 2009-03-01 19:25:10 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Update to version 2.0.0.20 Modified Paths: -------------- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile csw/mgar/pkg/firefox/branches/firefox3-packaging/files/firefox.desktop csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/checksums csw/mgar/pkg/firefox/trunk/files/.mozconfig csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec csw/mgar/pkg/firefox/trunk/files/autoconf.mk.in.diff csw/mgar/pkg/firefox/trunk/files/firefox.desktop csw/mgar/pkg/firefox/trunk/removeBuildPathFromJar.sh Removed Paths: ------------- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.depend csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.depend csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.gspec csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.prototype csw/mgar/pkg/firefox/trunk/files/CSWfirefoxrt.depend csw/mgar/pkg/firefox/trunk/files/CSWfirefoxrt.gspec csw/mgar/pkg/firefox/trunk/files/CSWfirefoxrt.prototype csw/mgar/pkg/firefox/trunk/files/file_id.cc.diff csw/mgar/pkg/firefox/trunk/files/jemalloc.c.diff csw/mgar/pkg/firefox/trunk/files/md5.h.diff csw/mgar/pkg/firefox/trunk/files/nsExceptionHandler.cpp.diff csw/mgar/pkg/firefox/trunk/files/nsMathUtils.h.diff csw/mgar/pkg/firefox/trunk/files/nsNativeApSuportUnix.cpp.diff csw/mgar/pkg/firefox/trunk/files/packager.mk.diff csw/mgar/pkg/firefox/trunk/files/solaris_lwp.h.diff csw/mgar/pkg/firefox/trunk/files/stdbool.h csw/mgar/pkg/firefox/trunk/generatePrototype.sh Property Changed: ---------------- csw/mgar/pkg/firefox/trunk/ Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile 2009-03-01 19:25:10 UTC (rev 3549) @@ -3,8 +3,6 @@ CATEGORIES = apps DISTNAME = $(GARNAME) -DESTDIR = $(DESTROOT)/build.$(GARNAME).$(GAROSREL)-$(GARCH) - DESCRIPTION = Firefox Community Edition web browser define BLURB The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web. Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/files/firefox.desktop =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/files/firefox.desktop 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/files/firefox.desktop 2009-03-01 19:25:10 UTC (rev 3549) @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Firefox -Comment=Firefox Blastwave.org Community Edition +Comment=Firefox Community Edition TryExec=firefox Exec=firefox %u Icon=firefox.png Property changes on: csw/mgar/pkg/firefox/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-03-01 19:25:10 UTC (rev 3549) @@ -1,74 +1,85 @@ GARNAME = firefox -GARVERSION = 3.0.4 +GARVERSION = 2.0.0.20 CATEGORIES = apps DISTNAME = $(GARNAME) -DESTDIR = $(DESTROOT)/build.$(GARNAME).$(GAROSREL)-$(GARCH) - DESCRIPTION = Firefox Community Edition web browser define BLURB - The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web. +The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web. endef -include gar/category.mk - -UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/ -MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 -DISTFILES += $(call admfiles,CSWfirefox, depend postinstall postremove ) +DISTFILES += $(call admfiles,CSWfirefox, postinstall postremove ) -# Defines the list of patches to be applied to the sources -PATCHFILES = autoconf.mk.in.diff -PATCHFILES += packager.mk.diff -PATCHFILES += jemalloc.c.diff -PATCHFILES += nsMathUtils.h.diff -PATCHFILES += file_id.cc.diff -PATCHFILES += md5.h.diff -PATCHFILES += solaris_lwp.h.diff -PATCHFILES += nsNativeApSuportUnix.cpp.diff -PATCHFILES += nsExceptionHandler.cpp.diff - -PERL=/opt/csw/bin/perl -CXXFLAGS+=-xlibmil -xlibmopt -features=tmplife -norunpath -CFLAGS+=-xlibmil -D__solaris__ - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/ -CFLAGS+= -DG_HAVE_ISO_VARARGS -CXXFLAGS+= -DG_HAVE_ISO_VARARGS -LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 +PERL="/opt/csw/bin/perl" +CFLAGS=-xlibmil +CXXFLAGS=-xlibmil -xlibmopt -features=tmplife -norunpath +LDFLAGS=-R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib export PERL CFLAGS CXXFLAGS LDFLAGS CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox +PATCHFILES = autoconf.mk.in.diff +TEST_SCRIPTS = -TEST_SCRIPTS = none +# Variable for direct access to working dir +WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) +WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) -test-none: - @$(MAKECOOKIE) +# Dependencies tracking +REQUIRED_PKGS_CSWfirefox += CSWbonobo2 +REQUIRED_PKGS_CSWfirefox += CSWfconfig +REQUIRED_PKGS_CSWfirefox += CSWftype2 +REQUIRED_PKGS_CSWfirefox += CSWgconf2 +REQUIRED_PKGS_CSWfirefox += CSWggettextrt +REQUIRED_PKGS_CSWfirefox += CSWglib2 +REQUIRED_PKGS_CSWfirefox += CSWgnomekeyring +REQUIRED_PKGS_CSWfirefox += CSWgnomevfs2 +REQUIRED_PKGS_CSWfirefox += CSWgtk2 +REQUIRED_PKGS_CSWfirefox += CSWlibart +REQUIRED_PKGS_CSWfirefox += CSWlibatk +REQUIRED_PKGS_CSWfirefox += CSWlibbonoboui +REQUIRED_PKGS_CSWfirefox += CSWlibcairo +REQUIRED_PKGS_CSWfirefox += CSWlibgnome +REQUIRED_PKGS_CSWfirefox += CSWlibgnomecanvas +REQUIRED_PKGS_CSWfirefox += CSWlibgnomeui +REQUIRED_PKGS_CSWfirefox += CSWlibidl +REQUIRED_PKGS_CSWfirefox += CSWlibpopt +REQUIRED_PKGS_CSWfirefox += CSWlibxft2 +REQUIRED_PKGS_CSWfirefox += CSWlibxrender +REQUIRED_PKGS_CSWfirefox += CSWorbit2 +REQUIRED_PKGS_CSWfirefox += CSWpango +REQUIRED_PKGS_CSWfirefox += CSWzlib post-extract: - ( mv $(WORKDIR)/mozilla $(WORKDIR)/$(DISTNAME) ) - ( cp $(FILEDIR)/stdbool.h $(WORKDIR)/$(DISTNAME)/memory/jemalloc/ ) + @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD) @$(MAKECOOKIE) pre-configure: - ( cp $(FILEDIR)/.mozconfig $(WORKDIR)/$(DISTNAME)/.mozconfig ) + @cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig pre-install: - ( if [ ! -d $(DESTDIR)/opt/csw/bin ] ; then mkdir -p $(DESTDIR)/opt/csw/bin ; fi ) - ( cd $(DESTDIR)/opt/csw/bin && if [ -f firefox ] ; then rm firefox ; fi && ln -s ../mozilla/firefox/bin/firefox . ) - ( mkdir -p $(DESTDIR)/opt/csw/share/pixmaps ) - ( cp $(WORKDIR)/$(DISTNAME)/other-licenses/branding/firefox/mozicon128.png $(DESTDIR)/opt/csw/share/pixmaps/firefox.png ) - ( mkdir -p $(DESTDIR)/opt/csw/share/applications ) - ( cp $(FILEDIR)/firefox.desktop $(DESTDIR)/opt/csw/share/applications/firefox.desktop ) - ( mkdir -p $(DESTDIR)/opt/csw/share/gnome/mime-info ) - ( cp $(FILEDIR)/firefox.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/firefox.keys ) + ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) + ( cd $(WORK_INSTALL)/opt/csw/bin && if [ -f firefox ] ; then rm firefox ; fi && ln -s ../mozilla/firefox/bin/firefox . ) + ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) + ( cp $(WORK_BUILD)/other-licenses/branding/firefox/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/firefox.png ) + ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) + ( cp $(FILEDIR)/firefox.desktop $(WORK_INSTALL)/opt/csw/share/applications/firefox.desktop ) + ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) + ( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys ) post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) - ( gfind $(DESTDIR)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; ) - ( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; ) - ( gfind $(DESTDIR)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) + ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) + ( mv $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp > $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config && rm $(WORK_INSTALL)/opt/csw/mozilla/firefox/bin/firefox-config.temp ) + ( mv $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp > $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc && rm $(WORK_INSTALL)/opt/csw/mozilla/firefox/lib/pkgconfig/firefox-nspr.pc.temp ) + ( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) + ( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) + ( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) +# include the rest of GAR +include gar/category.mk + Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/checksums 2009-03-01 19:25:10 UTC (rev 3549) @@ -0,0 +1,6 @@ +f3718fefd01c8edc007ec0b416a8a7b8 download/firefox-2.0.0.20-source.tar.bz2 +35b08b743fae892fc69aed10cdb3a7cf download/CSWfirefox.gspec +e6a5bb96973bba048d61f64c14a6bbc4 download/CSWfirefox.depend +f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall +6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove +ffec5571cbae2a9fae89ba6a3d3f81c5 download/autoconf.mk.in.diff Modified: csw/mgar/pkg/firefox/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/firefox/trunk/files/.mozconfig 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/files/.mozconfig 2009-03-01 19:25:10 UTC (rev 3549) @@ -8,7 +8,7 @@ ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --enable-xft -ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-default-toolkit=gtk2 ac_add_options --disable-auto-deps ac_add_options --enable-optimize="-xO3" ac_add_options --disable-updater Deleted: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.depend =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.depend 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.depend 2009-03-01 19:25:10 UTC (rev 3549) @@ -1,29 +0,0 @@ -P CSWbonobo2 libbonobo2 - GNOME component and compound document system -P CSWfconfig fontconfig - A library for configuring and customizing font access. -P CSWftype2 freetype2 - A Free High-Quality and Portable Font Engine -P CSWgconf2 gconf2 - GNOME configuration database system -P CSWglib2 glib2 - the low-level core library for GTK+ and GNOME -P CSWgnomevfs2 gnomevfs2 - GNOME Virtual File System -P CSWgtk2 gtk2 - GTK+, The multi-platform toolkit for GUI development -P CSWlibart libart - High performance 2D graphics library -P CSWlibatk libatk - Accessibility toolkit for GNOME -P CSWlibbonoboui libbonoboui - UI code for the GNOME 2 Object Activation Framework -P CSWlibgnome libgnome - The main GNOME library -P CSWlibgnomecanvas libgnomecanvas - Gnome2 Canvas Lib -P CSWlibgnomeui libgnomeui - The main GNOME 2 UI library -P CSWlibidl libidl - Library for handling CORBA IDL -P CSWlibpopt libpopt - Command line option parsing library -P CSWlibxft2 libxft2 - FreeType-based font drawing library for X -P CSWlibxml2 libxml2 - XML Parser Library -P CSWlibxrender libxrender - fontconfig.org Xrender library -P CSWorbit2 orbit2 - ORBit 2.x CORBA tools and libs -P CSWpango libpango - library for laying out and rendering international text -P CSWzlib zlib - Zlib Data Compression Library -P CSWggettext ggettext - GNU gettext -P CSWgnomekeyring gnomekeyring - keep password and other secrets for users -P CSWlibcairo libcairo - The Cairo 2D Graphics Library -P CSWiconv libiconv - GNU iconv library -P CSWdbusglib -P CSWlibdbus -P CSWlibx11 -P CSWsqlite3 Modified: csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefox.gspec 2009-03-01 19:25:10 UTC (rev 3549) @@ -1,4 +1,6 @@ %var bitname firefox %var pkgname CSWfirefox %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Deleted: csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.depend =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.depend 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.depend 2009-03-01 19:25:10 UTC (rev 3549) @@ -1 +0,0 @@ -P CSWfirefoxrt firefoxrt - Firefox Community Edition web browser runtime Deleted: csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.gspec =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.gspec 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.gspec 2009-03-01 19:25:10 UTC (rev 3549) @@ -1,4 +0,0 @@ -%var bitname firefoxdevel -%var pkgname CSWfirefoxdevel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.prototype =================================================================== --- csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.prototype 2009-03-01 14:01:03 UTC (rev 3548) +++ csw/mgar/pkg/firefox/trunk/files/CSWfirefoxdevel.prototype 2009-03-01 19:25:10 UTC (rev 3549) @@ -1,3199 +0,0 @@ -d none /opt/csw/mozilla 0755 root bin -d none /opt/csw/mozilla/firefox 0755 root bin -d none /opt/csw/mozilla/firefox/lib 0755 root bin -d none /opt/csw/mozilla/firefox/share 0755 root bin -d none /opt/csw/mozilla/firefox/share/idl 0755 root bin -f none /opt/csw/mozilla/firefox/share/idl/XPCIDispatch.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/domstubs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/gfxIFormats.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/gfxIImageFrame.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/gfxtypes.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgICache.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgIContainer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgIContainerObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgIDecoder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgIDecoderObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgIEncoder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgILoad.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgILoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/imgIRequest.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inICSSValueSearch.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inIDOMUtils.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inIDOMView.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inIDeepTreeWalker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inIFileSearch.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inIFlasher.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inISearchObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/inISearchProcess.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/jsdIDebuggerService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIJSSubScriptLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIPersonalDictionary.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozISpellCheckingEngine.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozISpellI18NManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozISpellI18NUtil.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageConnection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageDataSet.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageFunction.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageStatement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageStatementWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozIStorageValueArray.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/mozITXTToHTMLConv.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsCDefaultURIFixup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsCDocShell.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsCExternalHandlerService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsCURILoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsCWebBrowser.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsCWebBrowserPersist.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIASN1Object.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIASN1PrintableItem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIASN1Sequence.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIASN1Tree.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAboutModule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessNode.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibilityService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessible.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleAction.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleCaret.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleEditableText.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleHyperLink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleHyperText.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleRetrieval.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleSelectable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleTable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleText.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleTreeCache.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAccessibleValue.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAlertsService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAppShell.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAppShellService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAppStartup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIArray.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAsyncInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAsyncOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAsyncStreamCopier.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAtom.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAtomService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAuthModule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAuthPrompt.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAuthPromptProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAuthPromptWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompleteController.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompleteInput.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompletePopup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompleteResult.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompleteResultTypes.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompleteSearch.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoCompleteSimpleResult.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIAutoConfig.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBadCertListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBaseWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBidiKeyboard.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBinaryInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBinaryOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBookmarkTransactionManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBookmarksService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBoxLayoutManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBoxPaintManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserDOMWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserGlue.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserInstance.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserProfileMigrator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBrowserSearchService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBufEntropyCollector.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIBufferedStreams.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIByteArrayInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIByteRangeRequest.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICMSDecoder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICMSEncoder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICMSMessage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICMSMessage2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICMSMessageErrors.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICMSSecureMessage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICRLInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICRLManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICache.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICacheEntryDescriptor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICacheListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICacheService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICacheSession.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICacheVisitor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICachingChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICancelable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICategoryManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICertPickDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICertSelect.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICertTree.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICertificateDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIChannelEventSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICharsetConverterManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICharsetResolver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIChromeEventHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIChromeRegistry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICipherInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICiter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClassInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClassicPluginFactory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClientAuthDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClipboard.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClipboardCommands.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClipboardDragDropHookList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClipboardDragDropHooks.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClipboardHelper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIClipboardOwner.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICloseAllWindows.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICollation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICollection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICommandHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICommandLine.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICommandLineHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICommandLineRunner.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICommandManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICommandParams.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIComponentLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIComponentLoaderManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIComponentManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIComponentManagerObsolete.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIComponentRegistrar.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIConsoleListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIConsoleMessage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIConsoleService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentPolicy.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentSniffer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentViewer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentViewerContainer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentViewerEdit.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContentViewerFile.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContextMenuListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIContextMenuListener2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIController.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIControllerCommand.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIControllerCommandTable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIControllerContext.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIControllers.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIConverterInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIConverterOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookie.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookie2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookieAcceptDialog.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookieConsent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookieManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookieManager2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookiePermission.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookiePromptService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookieService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICookieStorage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICryptoFIPSInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICryptoHash.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsICurrentCharsetListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDNSListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDNSRecord.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDNSService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOM3Document.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOM3DocumentEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOM3EventTarget.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOM3Node.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMAbstractView.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMAttr.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMBarProp.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMBeforeUnloadEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCDATASection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCRMFObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSS2Properties.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSCharsetRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSFontFaceRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSImportRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSMediaRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSMozDocumentRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSPageRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSPrimitiveValue.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSRuleList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSStyleDeclaration.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSStyleRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSStyleSheet.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSUnknownRule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSValue.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCSSValueList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCanvasRenderingContext2D.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCharacterData.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMChromeWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMClientInformation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMComment.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMConstructor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCounter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCrypto.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCryptoDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMCustomEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDOMConfiguration.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDOMException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDOMImplementation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDOMImplementationLS.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDOMStringList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentCSS.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentFragment.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentRange.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentStyle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentTraversal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentType.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentView.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMDocumentXBL.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMElementCSSInlineStyle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMEntity.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMEntityReference.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMEventGroup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMEventListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMEventTarget.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMGetSVGDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLAnchorElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLAppletElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLAreaElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLBRElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLBaseElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLBaseFontElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLBodyElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLButtonElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLCanvasElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLCollection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLDListElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLDirectoryElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLDivElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLEmbedElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLFieldSetElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLFontElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLFormElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLFrameElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLFrameSetElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLHRElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLHeadElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLHeadingElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLHtmlElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLIFrameElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLImageElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLInputElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLIsIndexElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLLIElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLLabelElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLLegendElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLLinkElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLMapElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLMenuElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLMetaElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLModElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLOListElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLObjectElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLOptGroupElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLOptionElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLOptionsCollection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLParagraphElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLParamElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLPreElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLQuoteElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLScriptElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLSelectElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLStyleElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTableCaptionElem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTableCellElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTableColElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTableElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTableRowElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTableSectionElem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTextAreaElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLTitleElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHTMLUListElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMJSWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMKeyEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSInput.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSLoadEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSOutput.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSParser.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSParserFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSProgressEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSResourceResolver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSSerializer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLSSerializerFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLinkStyle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMLocation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMMediaList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMMimeType.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMMimeTypeArray.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMMouseEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMMutationEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSDocumentStyle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSEditableElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSEventTarget.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSFeatureFactory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLAnchorElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLAreaElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLButtonElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLFormControlList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLFormElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLFrameElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLHRElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLImageElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLInputElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLOptionCollectn.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLOptionElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLSelectElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHTMLTextAreaElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSLocation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSRange.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSUIEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSXBLFormControl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNSXPathExpression.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNameList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNamedNodeMap.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNavigator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNode.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNodeFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNodeIterator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNodeList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMNotation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMPageTransitionEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMParser.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMPkcs11.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMPlugin.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMPluginArray.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMPopupBlockedEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMProcessingInstruction.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMRGBColor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMRange.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMRangeException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMRect.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAngle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimPresAspRatio.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimTransformList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedAngle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedEnum.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedLength.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedLengthList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedNumber.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedNumberList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedPathData.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedPoints.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedRect.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGAnimatedString.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGCircleElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGClipPathElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGDefsElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGDescElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGEllipseElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGFitToViewBox.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGForeignObjectElem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGGElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGGradientElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGImageElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGLength.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGLengthList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGLineElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGLocatable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGMarkerElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGMatrix.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGMetadataElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGNumber.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGNumberList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPathElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPathSeg.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPathSegList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPoint.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPointList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPolygonElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPolylineElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGPresAspectRatio.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGRect.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGRectElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGSVGElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGScriptElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGStopElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGStylable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGStyleElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGSymbolElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTSpanElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTextContentElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTextElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTextPathElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTextPositionElem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTitleElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTransform.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTransformList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGTransformable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGURIReference.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGUseElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGViewSpec.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGZoomAndPan.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSVGZoomEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMScreen.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSerializer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMSmartCardEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStorage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStorageEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStorageItem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStorageList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStorageWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStyleSheet.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMStyleSheetList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMText.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMToString.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMTreeWalker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMUIEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMUserDataHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMViewCSS.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMWindow2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMWindowCollection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMWindowInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMWindowUtils.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXMLDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXPathEvaluator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXPathException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXPathExpression.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXPathNSResolver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXPathNamespace.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXPathResult.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULButtonElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULCheckboxElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULCommandDispatcher.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULCommandEvent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULControlElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULDescriptionElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULImageElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULLabelElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULLabeledControlEl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULMenuListElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULMultSelectCntrlEl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULPopupElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULSelectCntrlEl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULSelectCntrlItemEl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULTextboxElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDOMXULTreeElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDataChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDebug.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDialogParamBlock.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDictionary.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDirIndex.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDirIndexListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDirectoryEnumerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDirectoryService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocCharset.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocNavStartProgressListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocShell.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocShellHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocShellLoadInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocShellTreeItem.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocShellTreeNode.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocShellTreeOwner.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocumentCharsetInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocumentLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocumentLoaderFactory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDocumentStateListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDownload.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDownloadManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDownloadProgressListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDownloader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDragDropHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDragService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIDragSession.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditActionListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditingSession.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorDocShell.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorIMESupport.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorLogging.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorMailSupport.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorSpellCheck.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEditorStyleSheets.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEmbeddingSiteWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEmbeddingSiteWindow2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEncodedChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEntityConverter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEntropyCollector.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEnumerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEnvironment.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIErrorService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEventHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEventQueue.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEventQueueService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIEventTarget.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExceptionService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExpatSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExtendedExpatSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExtensionManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExternalHelperAppService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExternalProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIExternalProtocolService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFIXptr.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFTPChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFactory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFastLoadFileControl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFastLoadService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeed.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedContainer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedElementBase.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedEntry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedGenerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedPerson.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedProcessor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedResult.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedResultService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedTextConstruct.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFeedWriter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFile.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFilePicker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileSpec.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileStreams.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileURL.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileUtilities.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFileView.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFind.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFindService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFontEnumerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFontList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFontPackageHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFontPackageProxy.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFontPackageService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFormFillController.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFormHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFormSigningDialog.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFormatConverter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFrameLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIFullScreen.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGConfService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGenKeypairInfoDlg.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGenericInterfaceInfoSet.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGlobalHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGlobalHistory2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGlobalHistory3.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIGnomeVFSService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTMLAbsPosEditor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTMLEditor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTMLInlineTableEditor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTMLObjectResizeListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTMLObjectResizer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTTPHeaderListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHTTPIndex.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHelperAppLauncherDialog.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHistoryEntry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpActivityObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpAuthManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpAuthenticator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpChannelInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpEventSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpHeaderVisitor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIHttpProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIIDNService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIIFrameBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIIOService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIIOService2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIIconURI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIImageDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIImageLoadingContent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIIncrementalDownload.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInlineSpellChecker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInputStreamChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInputStreamPump.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInputStreamTee.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInterfaceInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInterfaceInfoManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInterfaceInfoToIDL.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIInterfaceRequestor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJAR.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJARChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJARProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJARURI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJRILiveConnectPIPeer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJRILiveConnectPlugin.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJSConsoleService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJSContextStack.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJSRuntimeService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJVMAuthTools.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJVMConfigManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJVMManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIJVMPluginInstance.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIKeyModule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIKeygenThread.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsILineInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIListBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsILoadGroup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsILocalFile.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsILocalFileWin.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsILocale.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsILocaleService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMIMEHeaderParam.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMIMEInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMIMEInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMIMEService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMarkupDocumentViewer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMemory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMenuBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMenuRollup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMicrosummaryService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIModifyableXPointer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIModule.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMultiPartChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIMultiplexInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsINSSCertCache.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsINativeAppSupport.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsINativeScrollbar.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsINetUtil.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsINetworkLinkService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsINonBlockingAlertService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIOCSPResponder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIObjectInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIObjectOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIObserverService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPK11Token.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPK11TokenDB.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPKCS11Module.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPKCS11ModuleDB.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPKCS11Slot.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPKIParamBlock.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPassword.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPasswordInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPasswordManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPasswordManagerInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPermission.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPermissionManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPersistentProperties2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPhonetic.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPipe.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPlaintextEditor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPlugin.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginHost.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginInstance.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginInstanceOwner.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginInstancePeer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginInstancePeer2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginManager2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginStreamInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginStreamListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginTagInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPluginTagInfo2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPopupBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPopupWindowManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPref.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrefBranch.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrefBranch2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrefBranchInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrefLocalizedString.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrefService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrefetchService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrincipal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintOptions.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintProgress.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintProgressParams.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintSession.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintSettings.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintSettingsService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintStatusFeedback.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintingPrompt.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrintingPromptService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProcess.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProfile.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProfileChangeStatus.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProfileInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProfileMigrator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProfileStartupListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProfileUnlocker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProgrammingLanguage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProgressDialog.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProgressEventSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPrompt.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPromptService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProperties.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProperty.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPropertyBag.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIPropertyBag2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProtocolProxyCallback.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProtocolProxyFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProtocolProxyService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProxiedProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProxyAutoConfig.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProxyCreateInstance.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProxyInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIProxyObjectManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFCompositeDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFContainer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFContainerUtils.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFDelegateFactory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFInMemoryDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFInferDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFLiteral.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFNode.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFPropagatableDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFPurgeableDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFRemoteDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFResource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFXMLParser.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFXMLSerializer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFXMLSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRDFXMLSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIReadConfig.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRecyclingAllocator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRefreshURI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRegistry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRelativeFilePref.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRemoteService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRequest.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRequestObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRequestObserverProxy.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIResProtocolHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIResumableChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRollupListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIRunnable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXAttributes.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXContentHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXDTDHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXErrorHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXLexicalHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXLocator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXMutableAttributes.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXXMLFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISAXXMLReader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISHContainer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISHEntry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISHTransaction.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISHistory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISHistoryInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISHistoryListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISMimeCert.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPAttachments.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPBlock.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPCall.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPCallCompletion.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPDecoder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPEncoder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPEncoding.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPFault.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPHeaderBlock.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPMessage.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPParameter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPPropertyBagMutator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPResponse.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPResponseListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPServiceRegistry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPTransport.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOAPTransportListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISOCKSSocketInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISSLSocketControl.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISSLStatus.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISSLStatusProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGGeometrySource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGGlyphGeometrySource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGGlyphMetricsSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGGradient.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGPathGeometrySource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRectangleSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRenderer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererCanvas.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererGlyphGeometry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererGlyphMetrics.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererPathBuilder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererPathGeometry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererRegion.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISVGRendererSurface.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISafeOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISaveAsCharset.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISchema.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISchemaLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScreen.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScreenManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptContextOwner.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptError.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptEventHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptEventManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptLoaderObserver.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptSecurityManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableDateFormat.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableInterfaceInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableInterfaces.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptablePlugin.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableRegion.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableUConv.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScriptableUnescapeHTML.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScrollBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIScrollable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISearchContext.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISearchService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISecretDecoderRing.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISecureBrowserUI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISecurityCheckedComponent.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISecurityEventSink.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISecurityPref.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISecurityWarningDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISeekableStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelectElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelection2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelectionController.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelectionDisplay.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelectionImageService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelectionListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISelectionPrivate.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISemanticUnitScanner.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISerializable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIServerSocket.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIServiceManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISessionRoaming.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISessionStartup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISessionStore.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIShellService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISidebar.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISignatureVerifier.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISimpleEnumerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISimpleStreamListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISocketProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISocketProviderService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISocketTransport.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISocketTransportService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISound.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStandardURL.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStorageStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamBufferAccess.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamCipher.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamConverter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamConverterService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamListenerProxy.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamListenerTee.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStreamTransportService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStringBundle.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStringBundleOverride.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStringEnumerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStringStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIStyleSheetService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISupports.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISupportsArray.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISupportsIterators.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISupportsPrimitives.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISupportsPriority.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISyncLoadDOMService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsISyncStreamListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITXTToHTMLConv.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITableEditor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITextScroll.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITextServicesFilter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITextToSubURI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIThread.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITimelineService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITimer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITimerInternal.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITimerManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITokenDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITokenPasswordDialogs.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIToolkit.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIToolkitChromeRegistry.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIToolkitProfile.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIToolkitProfileService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITooltipListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITooltipTextProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITraceRefcnt.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransaction.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransactionList.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransactionListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransactionManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransfer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransferable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransport.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITransportSecurityInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITreeBoxObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITreeColumns.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITreeContentView.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITreeSelection.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITreeView.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsITypeAheadFind.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURIChecker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURIContentListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURIFixup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURILoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURIRefObject.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURL.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURLFormatter.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIURLParser.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUTF8ConverterService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUUIDGenerator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUnicharInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUnicharLineInputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUnicharOutputStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUnicharStreamListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUnicharStreamLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUnicodeNormalizer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUpdateService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUploadChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUrlClassifierDBService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUrlClassifierStreamUpdater.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUrlClassifierTable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUrlClassifierUtils.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUrlListManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUserCertPicker.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIUserInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIVariant.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIVersionComparator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIViewSourceChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWSDL.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWSDLLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWSDLSOAPBinding.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWSPInterfaceInfoService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWeakReference.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowser.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserChrome.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserChromeFocus.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserFind.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserFocus.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserPersist.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserPrint.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserSetup.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebBrowserStream.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebContentConverterRegistrar.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebContentHandlerRegistrar.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebNavigation.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebNavigationInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebPageDescriptor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebProgress.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebProgressListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebProgressListener2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebScriptsAccessService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebServiceErrorHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWebServiceProxy.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowCreator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowCreator2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowDataSource.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowMediator.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowMediatorListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowWatcher.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWindowlessPlugInstPeer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWritablePropertyBag.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWritablePropertyBag2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIWyciwygChannel.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIX509Cert.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIX509Cert3.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIX509CertDB.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIX509CertDB2.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIX509CertValidity.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXMLContentBuilder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXMLHttpRequest.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPCScriptNotify.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPCScriptable.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPCSecurityManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPConnect.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPIDialogService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPINotifier.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPIProgressDialog.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPInstallManager.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPInstallManagerUI.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPTLoader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXPointer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXSLTException.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXSLTProcessor.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXSLTProcessorObsolete.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXSLTProcessorPrivate.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFAttributeHandler.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFBindableElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFBindableElementWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFElementFactory.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFElementWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFGenericElement.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFGenericElementWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFPrivate.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFSVGVisual.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFSVGVisualWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFStyledElementWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFVisual.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFXMLVisual.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFXMLVisualWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFXULVisual.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXTFXULVisualWrapper.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULAppInfo.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULBrowserWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULBuilderListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULOverlayProvider.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULRuntime.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULSortService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULTemplateBuilder.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXULWindow.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXmlRpcClient.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIXmlRpcClientListener.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsIZipReader.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIAccessNode.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIAccessible.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIAccessibleDocument.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPICertNotification.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPICommandUpdater.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIDNSService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIEditorTransaction.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIPluginHost.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIPluginInstancePeer.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIPromptService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIProtocolProxyService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPISocketTransportService.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIWindowWatcher.idl 0644 root bin -f none /opt/csw/mozilla/firefox/share/idl/nsPIXPIProxy.idl 0644 root bin @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 1 20:27:34 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 01 Mar 2009 19:27:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3550] csw/mgar/pkg/firefox/trunk/Makefile Message-ID: Revision: 3550 http://gar.svn.sourceforge.net/gar/?rev=3550&view=rev Author: wbonnet Date: 2009-03-01 19:27:34 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Fix license path Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-03-01 19:25:10 UTC (rev 3549) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-03-01 19:27:34 UTC (rev 3550) @@ -71,6 +71,8 @@ ( cp $(FILEDIR)/firefox.desktop $(WORK_INSTALL)/opt/csw/share/applications/firefox.desktop ) ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) ( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys ) + @ginstall -d $(WORK_INSTALL)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORK_BUILD)/LICENSE $(WORK_INSTALL)$(datadir)/doc/$(GARNAME)/License.txt post-install: ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 2 19:08:29 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 02 Mar 2009 18:08:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[3551] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 3551 http://gar.svn.sourceforge.net/gar/?rev=3551&view=rev Author: bdwalton Date: 2009-03-02 18:08:29 +0000 (Mon, 02 Mar 2009) Log Message: ----------- change location of sample documentation Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-03-01 19:27:34 UTC (rev 3550) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-03-02 18:08:29 UTC (rev 3551) @@ -39,7 +39,7 @@ SPKG_DESC_CSWrubydev = Ruby Extension Development Files -PKGFILES_CSWrubydoc = $(datadir)/ri/.* $(docdir)/rubydoc/.* +PKGFILES_CSWrubydoc = $(datadir)/ri/.* $(docdir)/ruby/samples.* PKGFILES_CSWrubytk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb @@ -97,10 +97,10 @@ # Copy samples samples: - @mkdir -p $(DESTDIR)$(docdir)/rubydoc/ - @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/rubydoc/ + @mkdir -p $(DESTDIR)$(docdir)/ruby/ + @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/ruby/ @for ext in bigdecimal dl tk ; do \ - cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/rubydoc/sample/$$ext ; \ + cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/ruby/sample/$$ext ; \ done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 2 19:57:58 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 02 Mar 2009 18:57:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3552] csw/mgar/pkg/python/trunk/files Message-ID: Revision: 3552 http://gar.svn.sourceforge.net/gar/?rev=3552&view=rev Author: valholla Date: 2009-03-02 18:57:58 +0000 (Mon, 02 Mar 2009) Log Message: ----------- 2 new patches to fix library files and change to arch=v8 Added Paths: ----------- csw/mgar/pkg/python/trunk/files/configure.diff csw/mgar/pkg/python/trunk/files/python-config-in.diff Added: csw/mgar/pkg/python/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/python/trunk/files/configure.diff 2009-03-02 18:57:58 UTC (rev 3552) @@ -0,0 +1,12 @@ +--- Python-2.6.1/configure.orig 2009-03-01 22:10:31.322676775 -0600 ++++ Python-2.6.1/configure 2009-03-01 22:11:19.595609202 -0600 +@@ -13131,8 +13131,7 @@ + SunOS*) if test "$GCC" = yes; + then CCSHARED="-fPIC"; + elif test `uname -p` = sparc; +- then CCSHARED="-xcode=pic32"; +- else CCSHARED="-Kpic"; ++ then CCSHARED="-xO3 -xarch=v8"; + fi;; + hp*|HP*) if test "$GCC" = yes; + then CCSHARED="-fPIC"; Added: csw/mgar/pkg/python/trunk/files/python-config-in.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/python-config-in.diff (rev 0) +++ csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-03-02 18:57:58 UTC (rev 3552) @@ -0,0 +1,10 @@ +--- Python-2.6.1/Misc/python-config.in.orig 2009-03-02 12:51:22.272566712 -0600 ++++ Python-2.6.1/Misc/python-config.in 2009-03-02 12:50:38.306680748 -0600 +@@ -49,5 +49,7 @@ + # shared library in prefix/lib/. + if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): + libs.insert(0, '-L' + getvar('LIBPL')) ++ if opt == '--ldflags': ++ libs.insert(0, '-L /opt/csw/lib -R /opt/csw/lib') + print ' '.join(libs) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 2 19:59:48 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 02 Mar 2009 18:59:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3553] csw/mgar/pkg/python/trunk Message-ID: Revision: 3553 http://gar.svn.sourceforge.net/gar/?rev=3553&view=rev Author: valholla Date: 2009-03-02 18:59:47 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Makefile fix for patches Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-03-02 18:57:58 UTC (rev 3552) +++ csw/mgar/pkg/python/trunk/Makefile 2009-03-02 18:59:47 UTC (rev 3553) @@ -36,6 +36,8 @@ PATCHFILES += pyport.diff PATCHFILES += setup.diff PATCHFILES += site.diff +PATCHFILES += configure.diff +PATCHFILES += python-config-in.diff # Test for sunaudiodev fails. SKIPTEST = 1 @@ -50,6 +52,7 @@ CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-unicode=ucs4 CONFIGURE_ARGS += --with-fpectl +CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib/\$ISALIST -R/opt/csw/lib -L/opt/csw/lib' PKGFILES_CSWidle = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.* PKGFILES_CSWidle += $(bindir)/idle Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-03-02 18:57:58 UTC (rev 3552) +++ csw/mgar/pkg/python/trunk/checksums 2009-03-02 18:59:47 UTC (rev 3553) @@ -8,3 +8,5 @@ 05724da367b025ce525de2bb704af6e3 download/pyport.diff 296f46fb4a6a392093120cd86675309b download/setup.diff e1cb8bf39625613272c210c71274b1e0 download/site.diff +9b45df21739387380ba2f5737a443170 download/configure.diff +fc531b9bea2915c3b12528ab0674f582 download/python-config-in.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 2 20:34:04 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 02 Mar 2009 19:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[3554] csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/ iconv.diff Message-ID: Revision: 3554 http://gar.svn.sourceforge.net/gar/?rev=3554&view=rev Author: valholla Date: 2009-03-02 19:34:04 +0000 (Mon, 02 Mar 2009) Log Message: ----------- iconv patch Added Paths: ----------- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff Added: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff (rev 0) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff 2009-03-02 19:34:04 UTC (rev 3554) @@ -0,0 +1,19 @@ +--- php-5.2.6/ext/iconv/iconv.c.orig 2009-03-02 13:22:39.048498744 -0600 ++++ php-5.2.6/ext/iconv/iconv.c 2009-03-02 13:21:25.719941997 -0600 +@@ -41,12 +41,15 @@ + + #ifdef HAVE_ICONV + ++/* + #ifdef PHP_ICONV_H_PATH + #include PHP_ICONV_H_PATH + #else ++*/ + #include ++/* + #endif +- ++*/ + #ifdef HAVE_GLIBC_ICONV + #include + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 2 21:06:53 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 02 Mar 2009 20:06:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[3555] csw/mgar/pkg/python/trunk Message-ID: Revision: 3555 http://gar.svn.sourceforge.net/gar/?rev=3555&view=rev Author: valholla Date: 2009-03-02 20:06:53 +0000 (Mon, 02 Mar 2009) Log Message: ----------- update for library Modified Paths: -------------- csw/mgar/pkg/python/trunk/checksums csw/mgar/pkg/python/trunk/files/python-config-in.diff Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-03-02 19:34:04 UTC (rev 3554) +++ csw/mgar/pkg/python/trunk/checksums 2009-03-02 20:06:53 UTC (rev 3555) @@ -9,4 +9,4 @@ 296f46fb4a6a392093120cd86675309b download/setup.diff e1cb8bf39625613272c210c71274b1e0 download/site.diff 9b45df21739387380ba2f5737a443170 download/configure.diff -fc531b9bea2915c3b12528ab0674f582 download/python-config-in.diff +fae0bb9b9a5a21d755c971d2fce9b592 download/python-config-in.diff Modified: csw/mgar/pkg/python/trunk/files/python-config-in.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-03-02 19:34:04 UTC (rev 3554) +++ csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-03-02 20:06:53 UTC (rev 3555) @@ -5,6 +5,6 @@ if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): libs.insert(0, '-L' + getvar('LIBPL')) + if opt == '--ldflags': -+ libs.insert(0, '-L /opt/csw/lib -R /opt/csw/lib') ++ libs.insert(0, '-L/opt/csw/lib -R/opt/csw/lib/$ISALIST') print ' '.join(libs) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 2 21:13:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 02 Mar 2009 20:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[3556] csw/mgar/pkg/java Message-ID: Revision: 3556 http://gar.svn.sourceforge.net/gar/?rev=3556&view=rev Author: wbonnet Date: 2009-03-02 20:13:22 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Create tags associated to package released in unstable Added Paths: ----------- csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-unstable-20090302/ csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-unstable-20090302/ csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-unstable-20090302/ csw/mgar/pkg/java/ajccodec/tags/commons_codec-1.3,REV=2009.02.24-unstable-20090302/ csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-unstable-20090302/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 2 21:28:56 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 02 Mar 2009 20:28:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[3557] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 3557 http://gar.svn.sourceforge.net/gar/?rev=3557&view=rev Author: wbonnet Date: 2009-03-02 20:28:55 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Update to 3.6.10 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-02 20:13:22 UTC (rev 3556) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-02 20:28:55 UTC (rev 3557) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.4 +GARVERSION = 3.6.10 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-03-02 20:13:22 UTC (rev 3556) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-03-02 20:28:55 UTC (rev 3557) @@ -1,4 +1,4 @@ -b9832cd8734d4568e384e1c60b50c92f download/sqlite-3.6.4.tar.gz +a03bdc86df4025b6881d58557e4b5bd3 download/sqlite-3.6.10.tar.gz e59647218ad2eceb91311af1f74d5065 download/CSWsqlite3.gspec 21d83fd65f7e90aa1d6c03931cd10b58 download/CSWsqlite3.prototype d41d8cd98f00b204e9800998ecf8427e download/CSWsqlite3.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 2 22:40:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 02 Mar 2009 21:40:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[3558] csw/mgar/pkg/sqlite3/trunk/files Message-ID: Revision: 3558 http://gar.svn.sourceforge.net/gar/?rev=3558&view=rev Author: wbonnet Date: 2009-03-02 21:40:55 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Update in progress to version 3.6.10 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec csw/mgar/pkg/sqlite3/trunk/files/gar-base.diff Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/files/COPYING csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.depend csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.prototype csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.depend csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.prototype Deleted: csw/mgar/pkg/sqlite3/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/COPYING 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/COPYING 2009-03-02 21:40:55 UTC (rev 3558) @@ -1,37 +0,0 @@ -SQLite Copyright - -The original author of SQLite has dedicated the code to the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute the -original SQLite code, either in source code form or as a compiled binary, for -any purpose, commerical or non-commerical, and by any means. - -Contributed Code - -In order to keep SQLite complete free and unencumbered by copyright, other -contributors to the SQLite code base are asked to likewise dedicate their -contributions to the public domain. If you want to send a patch or enhancement -for possible inclusion in the SQLite source tree, please accompany the patch -with the following statement: - - The author or authors of this code dedicate any and all copyright interest - in this code to the public domain. We make this dedication for the benefit - of the public at large and to the detriment of our heirs and successors. - We intend this dedication to be an overt act of relinquishment in - perpetuity of all present and future rights this code under copyright law. - -Regrettably, as of 2003 October 20, we will no longer be able to accept patches -or changes to SQLite that are not accompanied by a statement such as the above. -In addition, if you make changes or enhancements as an employee, then a simple -statement such as the above is insufficient. You must also send by surface mail -a copyright release signed by a company officer. A signed original of the -copyright release should be mailed to: - - Hwaci - 6200 Maple Cove Lane - Charlotte, NC 28269 - USA - -A template copyright release is available in PDF or HTML. You can use this -release to make future changes. If you have contributed changes or enhancements -o SQLite in the past, and have not already done so, you are invited to -complete and sign a copy of the template and mail it to the address above. Modified: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.gspec 2009-03-02 21:40:55 UTC (rev 3558) @@ -1,4 +1,9 @@ %var bitname sqlite3 %var pkgname CSWsqlite3 %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/../COPYING +%copyright + + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information + + Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.prototype =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.prototype 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3.prototype 2009-03-02 21:40:55 UTC (rev 3558) @@ -1,10 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sqlite3 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libsqlite3.la 0755 root bin -f none /opt/csw/lib/libsqlite3.so.0.8.6 0755 root bin -s none /opt/csw/lib/libsqlite3.so.0=libsqlite3.so.0.8.6 -s none /opt/csw/lib/libsqlite3.so=libsqlite3.so.0.8.6 -i copyright=CSWsqlite3.copyright -i depend=CSWsqlite3.depend -i pkginfo=CSWsqlite3.pkginfo Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.depend =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.depend 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.depend 2009-03-02 21:40:55 UTC (rev 3558) @@ -1 +0,0 @@ - Modified: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec 2009-03-02 21:40:55 UTC (rev 3558) @@ -1,4 +1,7 @@ -%var bitname sqlite3dev -%var pkgname CSWsqlite3dev +%var bitname sqlite3_devel +%var pkgname CSWsqlite3devel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/../COPYING +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information + Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.prototype =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.prototype 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.prototype 2009-03-02 21:40:55 UTC (rev 3558) @@ -1,10 +0,0 @@ -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/sqlite3.h 0644 root bin -f none /opt/csw/include/sqlite3ext.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libsqlite3.a 0644 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/sqlite3.pc 0644 root bin -i copyright=CSWsqlite3dev.copyright -i depend=CSWsqlite3dev.depend -i pkginfo=CSWsqlite3dev.pkginfo Modified: csw/mgar/pkg/sqlite3/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/gar-base.diff 2009-03-02 20:28:55 UTC (rev 3557) +++ csw/mgar/pkg/sqlite3/trunk/files/gar-base.diff 2009-03-02 21:40:55 UTC (rev 3558) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru sqlite3-3.6.4.orig/src/tclsqlite.c sqlite3-3.6.4/src/tclsqlite.c ---- sqlite3-3.6.4.orig/src/tclsqlite.c 2008-10-14 20:07:41.000000000 +0200 -+++ sqlite3-3.6.4/src/tclsqlite.c 2008-11-07 23:14:32.334719000 +0100 +diff -Naur sqlite3-3.6.10.orig/src/tclsqlite.c sqlite3-3.6.10.patched/src/tclsqlite.c +--- sqlite3-3.6.10.orig/src/tclsqlite.c 2008-10-14 20:07:41.000000000 +0200 ++++ sqlite3-3.6.10.patched/src/tclsqlite.c 2008-11-07 23:14:32.334719000 +0100 @@ -16,6 +16,7 @@ */ #include "tcl.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 2 22:41:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 02 Mar 2009 21:41:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[3559] csw/mgar/pkg/sqlite3/trunk/files Message-ID: Revision: 3559 http://gar.svn.sourceforge.net/gar/?rev=3559&view=rev Author: wbonnet Date: 2009-03-02 21:41:13 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Update in progress to version 3.6.10 Added Paths: ----------- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec Deleted: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec 2009-03-02 21:40:55 UTC (rev 3558) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec 2009-03-02 21:41:13 UTC (rev 3559) @@ -1,7 +0,0 @@ -%var bitname sqlite3_devel -%var pkgname CSWsqlite3devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information - Copied: csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec (from rev 3558, csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3dev.gspec) =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec (rev 0) +++ csw/mgar/pkg/sqlite3/trunk/files/CSWsqlite3devel.gspec 2009-03-02 21:41:13 UTC (rev 3559) @@ -0,0 +1,7 @@ +%var bitname sqlite3_devel +%var pkgname CSWsqlite3devel +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 2 22:41:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 02 Mar 2009 21:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3560] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 3560 http://gar.svn.sourceforge.net/gar/?rev=3560&view=rev Author: wbonnet Date: 2009-03-02 21:41:38 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Update in progress to version 3.6.10 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/sqlite3/trunk/ Property changes on: csw/mgar/pkg/sqlite3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-02 21:41:13 UTC (rev 3559) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-02 21:41:38 UTC (rev 3560) @@ -7,39 +7,51 @@ SQLite is a in-process library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. endef +# Download informations MASTER_SITES = http://sqlite.org/ DISTFILES = sqlite-$(GARVERSION).tar.gz -PKGDIST = sqlite-$(GARVERSION).tar.gz -DISTFILES += CSWsqlite3.gspec CSWsqlite3.prototype CSWsqlite3.depend -DISTFILES += CSWsqlite3dev.gspec CSWsqlite3dev.prototype CSWsqlite3dev.depend -DISTFILES += COPYING -# DISTFILES += $(call admfiles,CSWsqlite3, depend) +DISTFILES += $(call admfiles, CSWsqlite3, ) +DISTFILES += $(call admfiles, CSWsqlite3devel, ) +DISTFILES += copyright.html # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib +# Package description +SPKG_DESC_CSWsqlite3 = The XCB library +SPKG_DESC_CSWsqlite3devel = $(SPKG_DESC_CSWsqlite3) development package -export CFLAGS CXXFLAGS LDFLAGS +# Dynamic prototype +PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) +PKGFILES_CSWsqlite3devel += $(prefix)/include/.* +PKGFILES_CSWsqlite3devel += $(prefix)/lib/.*\.a +PKGFILES_CSWsqlite3devel += $(prefix)/lib/pkgconfig/.* -PATCHFILES = gar-base.diff -TEST_SCRIPTS = none +# Build the 64 bits binaries +BUILD64 = 1 -GREP = ggrep +# Add some patches to the sources +PATCHFILES = gar-base.diff -include gar/category.mk +# Do not execute make test step +TEST_SCRIPTS = none -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man --infodir=/opt/csw/share/info --enable-threadsafe --disable-debug +# Make configure options +CONFIGURE_ARGS += --prefix=$(prefix) +CONFIGURE_ARGS += --mandir=$(mandir) +CONFIGURE_ARGS += --infodir=$(infodir) +CONFIGURE_ARGS += --enable-threadsafe --disable-debug test-none: @$(MAKECOOKIE) post-extract: - ( mv $(WORKDIR)/sqlite-$(GARVERSION) $(WORKDIR)/$(GARNAME)-$(GARVERSION) ) + ( cd $(WORKROOTDIR) ; for i in build-isa-* ; do mv $$i/sqlite-$(GARVERSION) $$i/$(GARNAME)-$(GARVERSION) ; done ) @$(MAKECOOKIE) -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) +pre-install: + @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/copyright.html $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) +include gar/category.mk + Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-03-02 21:41:13 UTC (rev 3559) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-03-02 21:41:38 UTC (rev 3560) @@ -5,5 +5,5 @@ 23720c906465d83a988ad20f62384a16 download/CSWsqlite3dev.gspec 6cf146bca1ef7840ec8e723c0d68ab75 download/CSWsqlite3dev.prototype 68b329da9893e34099c7d8ad5cb9c940 download/CSWsqlite3dev.depend -f275fb8bd4c68bc851a675636c12f8eb download/COPYING -6d37cef88090847b5989825be20e66d3 download/gar-base.diff +a0e12a72a1f5b972624c712532dc27d7 download/copyright.html +01747316846392e5ca9455b74af41d95 download/gar-base.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Mar 2 23:04:52 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 02 Mar 2009 22:04:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3561] csw/mgar/pkg Message-ID: Revision: 3561 http://gar.svn.sourceforge.net/gar/?rev=3561&view=rev Author: skayser Date: 2009-03-02 22:04:52 +0000 (Mon, 02 Mar 2009) Log Message: ----------- mairix: Initial commit Added Paths: ----------- csw/mgar/pkg/mairix/ csw/mgar/pkg/mairix/branches/ csw/mgar/pkg/mairix/tags/ csw/mgar/pkg/mairix/trunk/ csw/mgar/pkg/mairix/trunk/Makefile csw/mgar/pkg/mairix/trunk/checksums csw/mgar/pkg/mairix/trunk/files/ Property changes on: csw/mgar/pkg/mairix/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mairix/trunk/Makefile =================================================================== --- csw/mgar/pkg/mairix/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mairix/trunk/Makefile 2009-03-02 22:04:52 UTC (rev 3561) @@ -0,0 +1,43 @@ +GARNAME = mairix +GARVERSION = 0.21 +CATEGORIES = utils + +DESCRIPTION = An index and search tool for Maildir, MH, or mbox format email folders. +define BLURB + mairix is a program for indexing and searching email messages stored in + Maildir, MH or mbox folders. + + * Indexing is fast. It runs incrementally on new messages - any particular + message only gets scanned once in the lifetime of the index file. + + * The search mode populates a "virtual" maildir (or MH) folder with symlinks + which point to the real messages. This folder can be opened as usual in your + mail program. (Note, if messages are in mbox folders, copies are made. + Similarly if the virtual folder has mbox format, it is filled with copies + of the matched messages.) +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +SPKG_SOURCEURL = http://www.rpcurnow.force9.co.uk/mairix/ + +REQUIRED_PKGS = CSWbzip2 CSWzlib + +TEST_SCRIPTS = + +# configure doesn't understand most of the $(DIRPATHS) arguments +CONFIGURE_ARGS = --prefix=/opt/csw +CONFIGURE_ARGS += --bindir=/opt/csw/bin +CONFIGURE_ARGS += --infodir=/opt/csw/share/info +CONFIGURE_ARGS += --mandir=/opt/csw/share/man + +include gar/category.mk + +pre-build-modulated: + @perl -pi -e 's/__inline__/inline/' $(WORKSRC)/memmac.h + +post-install-modulated: DOCS = ACKNOWLEDGEMENTS NEWS README dotmairixrc.eg +post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) Added: csw/mgar/pkg/mairix/trunk/checksums =================================================================== --- csw/mgar/pkg/mairix/trunk/checksums (rev 0) +++ csw/mgar/pkg/mairix/trunk/checksums 2009-03-02 22:04:52 UTC (rev 3561) @@ -0,0 +1 @@ +821619895931711c370f51f3442a0ded download/mairix-0.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 2 23:11:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 02 Mar 2009 22:11:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3562] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 3562 http://gar.svn.sourceforge.net/gar/?rev=3562&view=rev Author: wbonnet Date: 2009-03-02 22:11:08 +0000 (Mon, 02 Mar 2009) Log Message: ----------- First attempt to buildon the farm Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-02 22:04:52 UTC (rev 3561) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-02 22:11:08 UTC (rev 3562) @@ -28,7 +28,10 @@ PKGFILES_CSWsqlite3devel += $(prefix)/lib/pkgconfig/.* # Build the 64 bits binaries -BUILD64 = 1 +BUILD64 = 1 +NO_ISAEXEC = 1 +EXTRA_BUILD_ISAS_sparc = sparcv8 sparcv9 +EXTRA_BUILD_ISAS_i386 = i386 amd64 # Add some patches to the sources PATCHFILES = gar-base.diff @@ -42,6 +45,8 @@ CONFIGURE_ARGS += --infodir=$(infodir) CONFIGURE_ARGS += --enable-threadsafe --disable-debug +#REQUIRED_PKGS_CSWlibxcbdevel = CSWlibxcb + test-none: @$(MAKECOOKIE) Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2009-03-02 22:04:52 UTC (rev 3561) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2009-03-02 22:11:08 UTC (rev 3562) @@ -1,9 +1,5 @@ a03bdc86df4025b6881d58557e4b5bd3 download/sqlite-3.6.10.tar.gz -e59647218ad2eceb91311af1f74d5065 download/CSWsqlite3.gspec -21d83fd65f7e90aa1d6c03931cd10b58 download/CSWsqlite3.prototype -d41d8cd98f00b204e9800998ecf8427e download/CSWsqlite3.depend -23720c906465d83a988ad20f62384a16 download/CSWsqlite3dev.gspec -6cf146bca1ef7840ec8e723c0d68ab75 download/CSWsqlite3dev.prototype -68b329da9893e34099c7d8ad5cb9c940 download/CSWsqlite3dev.depend +cdd419809af113a0b22d489cf24714fe download/CSWsqlite3.gspec +6e43cf703ea5eafe991a120abc06fd44 download/CSWsqlite3devel.gspec a0e12a72a1f5b972624c712532dc27d7 download/copyright.html 01747316846392e5ca9455b74af41d95 download/gar-base.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 2 23:36:22 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 02 Mar 2009 22:36:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[3563] csw/mgar/pkg/mod_python/trunk Message-ID: Revision: 3563 http://gar.svn.sourceforge.net/gar/?rev=3563&view=rev Author: valholla Date: 2009-03-02 22:36:22 +0000 (Mon, 02 Mar 2009) Log Message: ----------- compiled for python2.6 Modified Paths: -------------- csw/mgar/pkg/mod_python/trunk/Makefile csw/mgar/pkg/mod_python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mod_python/trunk/files/connobject.diff Modified: csw/mgar/pkg/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_python/trunk/Makefile 2009-03-02 22:11:08 UTC (rev 3562) +++ csw/mgar/pkg/mod_python/trunk/Makefile 2009-03-02 22:36:22 UTC (rev 3563) @@ -19,7 +19,6 @@ CATALOGNAME_CSWap2modpython = ap2_modpython SPKG_DESC_CSWap2modpython = an Apache/Python integration module -PATCHFILES = configure.diff PATCHFILES += connobject.diff # We define upstream file regex so we can be notifed of new upstream software release @@ -33,19 +32,13 @@ include gar/category.mk -#pre-configure: - #@( cd $(WORKSRC) ; autoconf ) - #@$(MAKECOOKIE) +DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython -#DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython +post-install-modulated: + @install -d $(DESTDOC) + @for file in COPYRIGHT CREDITS LICENSE NEWS NOTICE README ; do \ + ginstall -m 0644 $(WORKSRC)/$$file $(DESTDOC) ; \ + done + @( cd $(WORKSRC) ; gcp -vR examples doc-html $(DESTDOC) ) + @$(DONADA) -#post-install: install-doc - -#install-doc: - #@install -d $(DESTDOC) - #@for file in COPYRIGHT CREDITS LICENSE NEWS NOTICE README ; do \ - #ginstall -m 0644 $(WORKSRC)/$$file $(DESTDOC) ; \ - #done - #@( cd $(WORKSRC) ; gcp -vR examples doc-html $(DESTDOC) ) - #@$(MAKECOOKIE) - Modified: csw/mgar/pkg/mod_python/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_python/trunk/checksums 2009-03-02 22:11:08 UTC (rev 3562) +++ csw/mgar/pkg/mod_python/trunk/checksums 2009-03-02 22:36:22 UTC (rev 3563) @@ -2,5 +2,4 @@ 6fda2f740f138af54536b87fb598426b download/postinstall 6892dd209d16d2c565581e9de272cf3e download/preremove 0dd379f20ceb32fc77bb3a9bf045097f download/space -783e43fd9ed17cbea81abfabc852001e download/configure.diff -efd99b53da7ae63dab49edbcc8bd65c2 download/connobject.diff +44e80c5a863ba40809ad889f9c5d0307 download/connobject.diff Added: csw/mgar/pkg/mod_python/trunk/files/connobject.diff =================================================================== --- csw/mgar/pkg/mod_python/trunk/files/connobject.diff (rev 0) +++ csw/mgar/pkg/mod_python/trunk/files/connobject.diff 2009-03-02 22:36:22 UTC (rev 3563) @@ -0,0 +1,11 @@ +--- mod_python-3.3.1/src/connobject.c.orig 2009-03-02 16:21:31.870869598 -0600 ++++ mod_python-3.3.1/src/connobject.c 2009-03-02 16:22:11.934909344 -0600 +@@ -139,7 +139,7 @@ + bytes_read = 0; + + while ((bytes_read < len || len == 0) && +- !(b == APR_BRIGADE_SENTINEL(b) || ++ !(b == APR_BRIGADE_SENTINEL(bb) || + APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) { + + const char *data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Tue Mar 3 13:13:46 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 03 Mar 2009 12:13:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[3564] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 3564 http://gar.svn.sourceforge.net/gar/?rev=3564&view=rev Author: j_arndt Date: 2009-03-03 12:13:45 +0000 (Tue, 03 Mar 2009) Log Message: ----------- nsca: added dynamic dependencies, removed patch for source Makefile, some cleanup Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-02 22:36:22 UTC (rev 3563) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-03 12:13:45 UTC (rev 3564) @@ -9,30 +9,48 @@ MASTER_SITES = http://mesh.dl.sourceforge.net/sourceforge/nagios/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall depend) -DISTFILES += $(call admfiles,CSWsendnsca, preinstall depend) +DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall ) +DISTFILES += $(call admfiles,CSWsendnsca, preinstall ) DISTFILES += nsca nsca.xml svc-nsca PATCHFILES += submit_check_results.diff -PATCHFILES += makefile.diff +REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWnagios +REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt CSWnagios + CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --with-nsca-user=nagios -#CONFIGURE_ARGS += --with-nsca-grp=nagios CONFIGURE_ARGS += --with-nsca-port=5667 BUILD_TARGETS = nsca SKIPTEST = 1 -#INSTALL_ARGS = install-nsca -INSTALL_ARGS += install-sendnsca -INSTALL_ARGS += install-nsca - include gar/category.mk -pre-install-modulated: +NAGIOSBINDIR=$(prefix)/nagios/bin +NAGIOSCFGDIR=$(prefix)/nagios/etc +NSCADOCDIR=$(prefix)/share/doc/nsca +SENDNSCADOCDIR=$(prefix)/share/doc/send_nsca +CFGDIR=$(prefix)/etc + +post-install-modulated: ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(prefix)/nagios/bin ginstall -d $(DESTDIR)$(prefix)/nagios/etc - $(MAKECOOKIE) + ginstall -m 755 -d $(DESTDIR)$(NSCADOCDIR) + ginstall -m 755 $(WORKSRC)/src/nsca $(DESTDIR)$(NAGIOSBINDIR) + ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg + ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(NSCADOCDIR) + ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(NSCADOCDIR) + ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(NSCADOCDIR) + ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(NSCADOCDIR) + ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR) + ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) + ginstall -m 755 -d $(DESTDIR)$(CFGDIR) + ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) + ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg + ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR) + ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR) + ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR) + ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(SENDNSCADOCDIR) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2009-03-02 22:36:22 UTC (rev 3563) +++ csw/mgar/pkg/nsca/trunk/checksums 2009-03-03 12:13:45 UTC (rev 3564) @@ -3,12 +3,9 @@ 9fa3302e1adfe6fb72e91b3cb0f5fdc3 download/CSWnsca.prototype 1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall 7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall -4a31b1f69eb7caee94f3fffa1232e9f4 download/CSWnsca.depend b82767ed7ab002fea4b3a4395511c93c download/CSWsendnsca.gspec 8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall -a590499dfa6f086d05cda4d86c2333cc download/CSWsendnsca.depend 58baa05824b28682cef9e678c3d0cefa download/nsca b36f9006d3f725cc8d6cb9c01533a75c download/nsca.xml 58baa05824b28682cef9e678c3d0cefa download/svc-nsca cbb38cacd3ca318f00dfa0877b6017df download/submit_check_results.diff -9e1686ea93030fb004d8c65f8c0a2e7d download/makefile.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Tue Mar 3 13:40:35 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 03 Mar 2009 12:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[3565] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 3565 http://gar.svn.sourceforge.net/gar/?rev=3565&view=rev Author: j_arndt Date: 2009-03-03 12:40:35 +0000 (Tue, 03 Mar 2009) Log Message: ----------- nrpe: added dynamic dependencies and custom install script, removed patches for source Makefile, some cleanup Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-03 12:13:45 UTC (rev 3564) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-03 12:40:35 UTC (rev 3565) @@ -7,13 +7,15 @@ NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. endef -#MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagios/ -MASTER_SITES = $(SF_MASTERS) +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall postinstall preremove depend) +DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall postinstall preremove ) DISTFILES += svc-nrpe nrpe.xml nrpe -DISTFILES += $(call admfiles,CSWnrpeplugin, prototype depend) +DISTFILES += $(call admfiles,CSWnrpeplugin, prototype ) +REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap +REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include @@ -21,26 +23,37 @@ CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include CONFIGURE_ARGS += --prefix=/opt/csw/nagios CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios -CONFIGURE_ARGS += --with-command-user=nagios -CONFIGURE_ARGS += --with-command-group=nagios PATCHFILES = patch.diff # Removal of LOG_AUTHPRIV and LOG_FTP # Solaris doesn't have these log facilities PATCHFILES += configure.diff -PATCHFILES += makefile.diff -PATCHFILES += doc.diff # changes made to global Makefile.in to copy some docs -sysconfdir ?= $(prefix)/nagios/etc -bindir ?= $(prefix)/bin -libexecdir ?= $(prefix)/libexec/nagios-plugins -datadir ?= $(prefix)/share +sysconfdir = $(prefix)/nagios/etc +bindir = $(prefix)/bin +libexecdir = $(prefix)/libexec/nagios-plugins +datadir = $(prefix)/share +TEST_TARGET = all +INSTALL_SCRIPTS = custom -#EXTRA_LIB = /opt/csw/lib +include gar/category.mk -TEST_TARGET = all +DOCDIR=$(datadir)/doc/nrpe +CFGDIR=$(sysconfdir) +LIBEXECDIR=$(libexecdir) +BINDIR=$(bindir) -INSTALL_ARGS += install-docs -INSTALL_ARGS += install-daemon-config - -include gar/category.mk +install-custom: + ginstall -m 775 -d $(DESTDIR)$(DOCDIR) + ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR) + ginstall -m 755 -d $(DESTDIR)$(BINDIR) + ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR) + ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR) + ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR) + ginstall -m 775 -d $(DESTDIR)$(CFGDIR) + ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-03-03 12:13:45 UTC (rev 3564) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-03-03 12:40:35 UTC (rev 3565) @@ -5,14 +5,10 @@ 53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall 71c9056ac6d0010a748745a405385d55 download/CSWnrpe.postinstall 393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove -c585258595292cc43525385c87e1d126 download/CSWnrpe.depend ec1857a4400022e3eec874c34e2b7232 download/svc-nrpe 1ee84a3e24cd4237bbb1fae59fc1d4ca download/nrpe.xml ec1857a4400022e3eec874c34e2b7232 download/nrpe 54aebe8f3d7bc8d2ec5ea1954d859b10 download/CSWnrpeplugin.gspec e22a7817c7665e79bcbad7e091375be9 download/CSWnrpeplugin.prototype -a3658628a24ac990a0e3b552a9fcb8db download/CSWnrpeplugin.depend 5b02d4385daaea2a8c13903539aa6189 download/patch.diff 4b51476c782d2c5764d10f8ed530ada0 download/configure.diff -90d1e4acfa3f031b20fc7e229387d0e6 download/makefile.diff -34edc5baa80d11bae0ddd754e2e72b23 download/doc.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Mar 3 16:09:39 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 03 Mar 2009 15:09:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[3566] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 3566 http://gar.svn.sourceforge.net/gar/?rev=3566&view=rev Author: skayser Date: 2009-03-03 15:09:38 +0000 (Tue, 03 Mar 2009) Log Message: ----------- When GARFLAVOR=DBG drop strip from $(POST_INSTALL_TARGETS) Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-03-03 12:40:35 UTC (rev 3565) +++ csw/mgar/gar/v2/gar.mk 2009-03-03 15:09:38 UTC (rev 3566) @@ -415,7 +415,10 @@ $(DONADA) # strip - Strip executables -POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) +ifneq ($(GARFLAVOR),DBG) + POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) +endif + strip: @for target in $(STRIP_DIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) ; \ do \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 3 16:10:17 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 03 Mar 2009 15:10:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[3567] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 3567 http://gar.svn.sourceforge.net/gar/?rev=3567&view=rev Author: bdwalton Date: 2009-03-03 15:10:17 +0000 (Tue, 03 Mar 2009) Log Message: ----------- force -R path in ldflags so it lands in rbconfig.rb Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-03-03 15:09:38 UTC (rev 3566) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-03-03 15:10:17 UTC (rev 3567) @@ -60,6 +60,8 @@ GARCOMPILER = GNU +EXTRA_LDFLAGS = -R /opt/csw/gcc4/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pthread CONFIGURE_ARGS += --enable-shared This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Mar 3 18:20:31 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 03 Mar 2009 17:20:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3568] csw/mgar/pkg Message-ID: Revision: 3568 http://gar.svn.sourceforge.net/gar/?rev=3568&view=rev Author: valholla Date: 2009-03-03 17:20:22 +0000 (Tue, 03 Mar 2009) Log Message: ----------- rename existing gnupg to gnupg2, gnupg2.x is not a dropin replacement for gnupg1.x Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnupg2/ csw/mgar/pkg/gnupg2/trunk/ Removed Paths: ------------- csw/mgar/pkg/gnupg2/trunk/ Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2009-03-03 15:10:17 UTC (rev 3567) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-03-03 17:20:22 UTC (rev 3568) @@ -7,8 +7,8 @@ RFC 2440 compliant tool for secure communication and data storage endef -PACKAGES = CSWgnupg -CATALOGNAME = gnupg +PACKAGES = CSWgnupg2 +CATALOGNAME = gnupg2 SPKG_DESC = GnuPG is a complete and free replacement for PGP. SPKG_SOURCEURL = http://www.gnupg.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Mar 3 18:21:05 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 03 Mar 2009 17:21:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3569] csw/mgar/pkg/gnupg/ Message-ID: Revision: 3569 http://gar.svn.sourceforge.net/gar/?rev=3569&view=rev Author: valholla Date: 2009-03-03 17:21:02 +0000 (Tue, 03 Mar 2009) Log Message: ----------- rename existing gnupg to gnupg2, gnupg2.x is not a dropin replacement for gnupg1.x Removed Paths: ------------- csw/mgar/pkg/gnupg/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Mar 3 18:27:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 03 Mar 2009 17:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3570] csw/mgar/pkg Message-ID: Revision: 3570 http://gar.svn.sourceforge.net/gar/?rev=3570&view=rev Author: valholla Date: 2009-03-03 17:27:08 +0000 (Tue, 03 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/gnupg/ csw/mgar/pkg/gnupg/branches/ csw/mgar/pkg/gnupg/tags/ csw/mgar/pkg/gnupg/trunk/ csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums csw/mgar/pkg/gnupg/trunk/files/ Property changes on: csw/mgar/pkg/gnupg/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2009-03-03 17:27:08 UTC (rev 3570) @@ -0,0 +1,70 @@ +GARNAME = gnupg +GARVERSION = 1.4.9 +CATEGORIES = apps + +DESCRIPTION = GnuPG is a complete and free replacement for PGP. +define BLURB + RFC 2440 compliant tool for secure communication and data storage +endef + +PACKAGES = CSWgnupg +CATALOGNAME = gnupg +SPKG_DESC = GnuPG is a complete and free replacement for PGP. + +SPKG_SOURCEURL = http://www.gnupg.org/ +MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +BUILD64 = 1 +NO_ISAEXEC = 0 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libcurl +CONFIGURE_ARGS += --with-ldap +CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-bzip2 +CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --enable-threads=solaris + +# This is somehow not correctly detected from autoconf +EXTRA_LINKER_FLAGS = -lgpg-error +# Needed for nanosleep() +EXTRA_LINKER_FLAGS += -lrt + +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-agent +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-connect-agent +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg2 +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgconf +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgkey2ssh +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgparsemail +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsm +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsm-gencert.sh +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgv2 +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/kbxutil +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/scdaemon +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/watchgnupg + +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-agent +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-connect-agent +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg2 +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgconf +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgkey2ssh +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgparsemail +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsm +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsm-gencert.sh +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgv2 +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/kbxutil +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/scdaemon +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/watchgnupg + +REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt CSWlibassuan +REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn +REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt + +TEST_TARGET = check + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 3 19:06:43 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 03 Mar 2009 18:06:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[3571] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 3571 http://gar.svn.sourceforge.net/gar/?rev=3571&view=rev Author: bdwalton Date: 2009-03-03 18:06:43 +0000 (Tue, 03 Mar 2009) Log Message: ----------- correct typo in pkgfiles. Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-03-03 17:27:08 UTC (rev 3570) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-03-03 18:06:43 UTC (rev 3571) @@ -39,7 +39,7 @@ SPKG_DESC_CSWrubydev = Ruby Extension Development Files -PKGFILES_CSWrubydoc = $(datadir)/ri/.* $(docdir)/ruby/samples.* +PKGFILES_CSWrubydoc = $(datadir)/ri/.* $(docdir)/ruby/sample.* PKGFILES_CSWrubytk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Mar 3 20:13:22 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 03 Mar 2009 19:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[3572] csw/mgar/pkg/mairix/trunk Message-ID: Revision: 3572 http://gar.svn.sourceforge.net/gar/?rev=3572&view=rev Author: skayser Date: 2009-03-03 19:13:22 +0000 (Tue, 03 Mar 2009) Log Message: ----------- mairix: work in progress Modified Paths: -------------- csw/mgar/pkg/mairix/trunk/Makefile csw/mgar/pkg/mairix/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff Modified: csw/mgar/pkg/mairix/trunk/Makefile =================================================================== --- csw/mgar/pkg/mairix/trunk/Makefile 2009-03-03 18:06:43 UTC (rev 3571) +++ csw/mgar/pkg/mairix/trunk/Makefile 2009-03-03 19:13:22 UTC (rev 3572) @@ -2,7 +2,7 @@ GARVERSION = 0.21 CATEGORIES = utils -DESCRIPTION = An index and search tool for Maildir, MH, or mbox format email folders. +DESCRIPTION = An index and search tool for Maildir, MH, or mbox define BLURB mairix is a program for indexing and searching email messages stored in Maildir, MH or mbox folders. @@ -25,19 +25,32 @@ TEST_SCRIPTS = +# Mention option -x in the help message (-h) and provide fine grained +# timestamps (still needs a patch to rfc822.c, where HMS are dropped) +PATCHFILES = patch-excerpt.diff + # configure doesn't understand most of the $(DIRPATHS) arguments CONFIGURE_ARGS = --prefix=/opt/csw CONFIGURE_ARGS += --bindir=/opt/csw/bin CONFIGURE_ARGS += --infodir=/opt/csw/share/info CONFIGURE_ARGS += --mandir=/opt/csw/share/man +#GARFLAVOR = DBG + include gar/category.mk +# configure uses bashisms but doesn't declare bash as its interpreter +pre-configure-modulated: + @perl -pi -e 's|#!/bin/sh|#!/bin/bash|' $(WORKSRC)/configure + $(MAKECOOKIE) + pre-build-modulated: @perl -pi -e 's/__inline__/inline/' $(WORKSRC)/memmac.h + $(MAKECOOKIE) post-install-modulated: DOCS = ACKNOWLEDGEMENTS NEWS README dotmairixrc.eg post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) + $(MAKECOOKIE) Modified: csw/mgar/pkg/mairix/trunk/checksums =================================================================== --- csw/mgar/pkg/mairix/trunk/checksums 2009-03-03 18:06:43 UTC (rev 3571) +++ csw/mgar/pkg/mairix/trunk/checksums 2009-03-03 19:13:22 UTC (rev 3572) @@ -1 +1,2 @@ 821619895931711c370f51f3442a0ded download/mairix-0.21.tar.gz +e14ad9070d252bd7bb2ddef19915c145 download/patch-excerpt.diff Added: csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff =================================================================== --- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff (rev 0) +++ csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff 2009-03-03 19:13:22 UTC (rev 3572) @@ -0,0 +1,23 @@ +diff -ur mairix-0.21.org/mairix.c mairix-0.21/mairix.c +--- mairix-0.21.org/mairix.c 2007-06-22 21:18:00.000000000 +0100 ++++ mairix-0.21/mairix.c 2009-03-03 14:17:23.119599595 +0000 +@@ -410,6 +410,7 @@ + "-t : include all messages in same threads as matching messages\n" + "-o : override setting of mfolder from mairixrc file\n" + "-r : force raw output regardless of mformat setting in mairixrc file\n" ++ "-x : show an excerpt of the headers of the matching messages\n" + "expr_i : search expression (all expr's AND'ed together):\n" + " word : match word in message body and major headers\n" + " t:word : match word in To: header\n" +diff -ur mairix-0.21.org/search.c mairix-0.21/search.c +--- mairix-0.21.org/search.c 2007-06-22 21:18:00.000000000 +0100 ++++ mairix-0.21/search.c 2009-03-03 14:19:30.048952226 +0000 +@@ -1208,7 +1208,7 @@ + if (parsed->hdrs.from) printf(" From: %s\n", parsed->hdrs.from); + if (parsed->hdrs.subject) printf(" Subject: %s\n", parsed->hdrs.subject); + thetm = gmtime(&parsed->hdrs.date); +- strftime(datebuf, sizeof(datebuf), "%a, %d %b %Y", thetm); ++ strftime(datebuf, sizeof(datebuf), "%a, %d %b %Y, %H:%M:%S", thetm); + printf(" Date: %s\n", datebuf); + free_rfc822(parsed); + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Tue Mar 3 20:41:25 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Tue, 03 Mar 2009 19:41:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3573] csw/mgar/pkg/sed/trunk/ Message-ID: Revision: 3573 http://gar.svn.sourceforge.net/gar/?rev=3573&view=rev Author: rmacduff Date: 2009-03-03 19:41:25 +0000 (Tue, 03 Mar 2009) Log Message: ----------- Cut over to gar2 Property Changed: ---------------- csw/mgar/pkg/sed/trunk/ Property changes on: csw/mgar/pkg/sed/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Tue Mar 3 20:58:08 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Tue, 03 Mar 2009 19:58:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[3574] csw/mgar/pkg/sed/trunk Message-ID: Revision: 3574 http://gar.svn.sourceforge.net/gar/?rev=3574&view=rev Author: rmacduff Date: 2009-03-03 19:58:08 +0000 (Tue, 03 Mar 2009) Log Message: ----------- Update to 4.1.5 Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile csw/mgar/pkg/sed/trunk/checksums Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2009-03-03 19:41:25 UTC (rev 3573) +++ csw/mgar/pkg/sed/trunk/Makefile 2009-03-03 19:58:08 UTC (rev 3574) @@ -1,5 +1,5 @@ GARNAME = sed -GARVERSION = 4.0.9 +GARVERSION = 4.1.5 CATEGORIES = utils DESCRIPTION = GNU Stream Editor Modified: csw/mgar/pkg/sed/trunk/checksums =================================================================== --- csw/mgar/pkg/sed/trunk/checksums 2009-03-03 19:41:25 UTC (rev 3573) +++ csw/mgar/pkg/sed/trunk/checksums 2009-03-03 19:58:08 UTC (rev 3574) @@ -1 +1 @@ -d8fb554bc6577aaedd39b94b3cb3df70 download/sed-4.0.9.tar.gz +7a1cbbbb3341287308e140bd4834c3ba download/sed-4.1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Mar 4 01:28:48 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 04 Mar 2009 00:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3575] csw/mgar/pkg Message-ID: Revision: 3575 http://gar.svn.sourceforge.net/gar/?rev=3575&view=rev Author: skayser Date: 2009-03-04 00:28:48 +0000 (Wed, 04 Mar 2009) Log Message: ----------- watch: Initial commit Added Paths: ----------- csw/mgar/pkg/watch/ csw/mgar/pkg/watch/branches/ csw/mgar/pkg/watch/tags/ csw/mgar/pkg/watch/trunk/ csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/checksums csw/mgar/pkg/watch/trunk/files/ csw/mgar/pkg/watch/trunk/files/getopt.c csw/mgar/pkg/watch/trunk/files/getopt.h csw/mgar/pkg/watch/trunk/files/getopt1.c csw/mgar/pkg/watch/trunk/files/gettext.h csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff csw/mgar/pkg/watch/trunk/files/snprintf.c csw/mgar/pkg/watch/trunk/files/snprintf.h Property changes on: csw/mgar/pkg/watch/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile (rev 0) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,68 @@ +# Todo +# * asprintf() from portable snprintf.c isn't working yet +# Header line on watch output always reads "Every fs: " +# +GARNAME = watch +GARVERSION = 3.2.7 +CATEGORIES = utils + +DESCRIPTION = Watch a program output change over time +define BLURB +endef + +# Usually we would use $(SF_MIRROR), but the procps folks didn't upload +# procps the usual way +SF_PROJ = procps +MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ +DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz +PATCHFILES = patch-extralibs.diff +DISTNAME = $(SF_PROJ)-$(GARVERSION) + +REQUIRED_PKGS = CSWncurses + +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_INC = /opt/csw/include/ncurses + +TEST_SCRIPTS = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +INSTALL_SCRIPTS = custom + +include gar/category.mk + +# procps is heavily GNU tailored, so we need to make some adjustments +# +# 1) Remove unnecessary build instructions that would cause errors otherwise +# 2) Bring in GNU getopt for getopt_long() +# 3) Bring in asprintf() +# +# GNU getopt from http://cherokee-project.com +# asprintf from http://www.ijs.si/software/snprintf/ +# + +# Tell snprintf.c that we have snprintf and need asprintf() +CFLAGS := $(CFLAGS) -DHAVE_SNPRINTF -DNEED_ASPRINTF + +pre-build-modulated: + @rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk + @cp $(FILEDIR)/snprintf* $(WORKSRC) + @cp $(FILEDIR)/getopt* $(WORKSRC) + @cp $(FILEDIR)/gettext.h* $(WORKSRC) + $(MAKECOOKIE) + +build-custom: + @(cd $(WORKSRC); \ + gmake ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" snprintf.o; \ + gmake ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" getopt.o; \ + gmake ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" getopt1.o; \ + gmake ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ + ALL_LDFLAGS="$(LDFLAGS)" watch) + $(MAKECOOKIE) + +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) + @ginstall -m 644 $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 + $(MAKECOOKIE) Added: csw/mgar/pkg/watch/trunk/checksums =================================================================== --- csw/mgar/pkg/watch/trunk/checksums (rev 0) +++ csw/mgar/pkg/watch/trunk/checksums 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,2 @@ +f490bca772b16472962c7b9f23b1e97d download/procps-3.2.7.tar.gz +223ba15056890d0d15431276d027d480 download/patch-extralibs.diff Added: csw/mgar/pkg/watch/trunk/files/getopt.c =================================================================== --- csw/mgar/pkg/watch/trunk/files/getopt.c (rev 0) +++ csw/mgar/pkg/watch/trunk/files/getopt.c 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,1139 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper at gnu.org + before changing it! + + Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, + 1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, + Inc. + + This file is part of the GNU C Library. + + 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 2, 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, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include +# include +#endif /* GNU C library. */ + +#include + +#ifdef VMS +# include +#endif + +#ifdef _LIBC +# include +#else +/* This is for other GNU distributions with internationalized messages. */ +# include "gettext.h" +#endif +#define _(msgid) gettext (msgid) + +#if defined _LIBC && defined USE_IN_LIBIO +# include +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized attribute_hidden; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifndef __GNU_LIBRARY__ + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Stored original parameters. + XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ +extern int __libc_argc; +extern char **__libc_argv; + +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +# ifdef USE_NONOPTION_FLAGS +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; +# endif + +# ifdef USE_NONOPTION_FLAGS +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +# else +# define SWAP_FLAGS(ch1, ch2) +# endif +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +static void +exchange (char **argv) +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +static const char * +_getopt_initialize (int argc, char *const *argv, const char *optstring) +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + if (posixly_correct == NULL + && argc == __libc_argc && argv == __libc_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (int argc, char *const *argv, + const char *optstring, const struct option *longopts, + int *longind, int long_only) +{ + int print_errors = opterr; + if (optstring[0] == ':') + print_errors = 0; + + if (argc < 1) + return -1; + + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#if defined _LIBC && defined USE_NONOPTION_FLAGS +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only + && (argv[optind][2] || !strchr (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]) >= 0) + { + + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); +#endif + } + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[optind - 1][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#else + fprintf (stderr, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], + pfound->name); +#else + fprintf (stderr, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); +#endif + } + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || strchr (optstring, *nextchar) == NULL) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[optind][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = strchr (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (posixly_correct) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: illegal option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); +#endif + } + else + { +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: invalid option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, + _("%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); +#endif + } + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); +#endif + } + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (int argc, char *const *argv, const char *optstring) +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* Not ELIDE_CODE. */ Added: csw/mgar/pkg/watch/trunk/files/getopt.h =================================================================== --- csw/mgar/pkg/watch/trunk/files/getopt.h (rev 0) +++ csw/mgar/pkg/watch/trunk/files/getopt.h 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,169 @@ +/* Declarations for getopt. + + Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, + 1999, 2001, 2003 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + + 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 2, 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, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _GETOPT_H + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif + +/* If __GNU_LIBRARY__ is not already defined, either we are being used + standalone, or this is the first header included in the source file. + If we are being used with glibc, we need to include , but + that does not exist if we are standalone. So: if __GNU_LIBRARY__ is + not defined, include , which will pull in for us + if it's from glibc. (Why ctype.h? It's guaranteed to exist and it + doesn't flood the namespace with stuff the way some other headers do.) */ +#if !defined __GNU_LIBRARY__ +# include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#ifdef __GNU_LIBRARY__ +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts); +#else /* not __GNU_LIBRARY__ */ +extern int getopt (); +#endif /* __GNU_LIBRARY__ */ + +#ifndef __need_getopt +extern int getopt_long (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt_internal (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only); +#endif + +#ifdef __cplusplus +} +#endif + +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt + +#endif /* getopt.h */ Added: csw/mgar/pkg/watch/trunk/files/getopt1.c =================================================================== --- csw/mgar/pkg/watch/trunk/files/getopt1.c (rev 0) +++ csw/mgar/pkg/watch/trunk/files/getopt1.c 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,93 @@ +/* getopt_long and getopt_long_only entry points for GNU getopt. + + Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, + 1997, 1998, 2003 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + + 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 2, 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, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef _LIBC +# include +#else +# include "getopt.h" +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +#include +#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +#define ELIDE_CODE +#endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#endif + +#ifndef NULL +#define NULL 0 +#endif + +int +getopt_long (int argc, + char *const *argv, + const char *options, + const struct option *long_options, + int *opt_index) +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only (int argc, + char *const *argv, + const char *options, + const struct option *long_options, + int *opt_index) +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 1); +} + +# ifdef _LIBC +libc_hidden_def (getopt_long) +libc_hidden_def (getopt_long_only) +# endif + +#endif /* Not ELIDE_CODE. */ Added: csw/mgar/pkg/watch/trunk/files/gettext.h =================================================================== --- csw/mgar/pkg/watch/trunk/files/gettext.h (rev 0) +++ csw/mgar/pkg/watch/trunk/files/gettext.h 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,69 @@ +/* Convenience header for conditional use of GNU . + Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LIBGETTEXT_H +#define _LIBGETTEXT_H 1 + +/* NLS can be disabled through the configure --disable-nls option. */ +#if ENABLE_NLS + +/* Get declarations of GNU message catalog functions. */ +# include + +#else + +/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which + chokes if dcgettext is defined as a macro. So include it now, to make + later inclusions of a NOP. We don't include + as well because people using "gettext.h" will not include , + and also including would fail on SunOS 4, whereas + is OK. */ +#if defined(__sun) +# include +#endif + +/* Disabled NLS. + The casts to 'const char *' serve the purpose of producing warnings + for invalid uses of the value returned from these functions. + On pre-ANSI systems without 'const', the config.h file is supposed to + contain "#define const". */ +# define gettext(Msgid) ((const char *) (Msgid)) +# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) +# define ngettext(Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dngettext(Domainname, Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define textdomain(Domainname) ((const char *) (Domainname)) +# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) +# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) + +#endif + +/* A pseudo function call that serves as a marker for the automated + extraction of messages, but does not call gettext(). The run-time + translation is done at a different place in the code. + The argument, String, should be a literal string. Concatenated strings + and other string expressions won't work. + The macro's expansion is not parenthesized, so that it is suitable as + initializer for static 'char[]' or 'const char[]' variables. */ +#define gettext_noop(String) String + +#endif /* _LIBGETTEXT_H */ Added: csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff =================================================================== --- csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff (rev 0) +++ csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,20 @@ +diff -ur procps-3.2.7.orig/watch.c procps-3.2.7/watch.c +--- procps-3.2.7.orig/watch.c 2009-03-04 00:47:36.646213261 +0100 ++++ procps-3.2.7/watch.c 2009-03-04 00:48:55.985676696 +0100 +@@ -13,7 +13,7 @@ + #define VERSION "0.2.0" + + #include +-#include ++#include "getopt.h" + #include + #include + #include +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "proc/procps.h" + + #ifdef FORCE_8BIT Added: csw/mgar/pkg/watch/trunk/files/snprintf.c =================================================================== --- csw/mgar/pkg/watch/trunk/files/snprintf.c (rev 0) +++ csw/mgar/pkg/watch/trunk/files/snprintf.c 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,1025 @@ +/* + * snprintf.c - a portable implementation of snprintf + * + * AUTHOR + * Mark Martinec , April 1999. + * + * Copyright 1999, Mark Martinec. All rights reserved. + * + * TERMS AND CONDITIONS + * This program is free software; you can redistribute it and/or modify + * it under the terms of the "Frontier Artistic License" which comes + * with this Kit. + * + * 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 Frontier Artistic License for more details. + * + * You should have received a copy of the Frontier Artistic License + * with this Kit in the file named LICENSE.txt . + * If not, I'll be glad to provide one. + * + * FEATURES + * - careful adherence to specs regarding flags, field width and precision; + * - good performance for large string handling (large format, large + * argument or large paddings). Performance is similar to system's sprintf + * and in several cases significantly better (make sure you compile with + * optimizations turned on, tell the compiler the code is strict ANSI + * if necessary to give it more freedom for optimizations); + * - return value semantics per ISO/IEC 9899:1999 ("ISO C99"); + * - written in standard ISO/ANSI C - requires an ANSI C compiler. + * + * SUPPORTED CONVERSION SPECIFIERS AND DATA TYPES + * + * This snprintf only supports the following conversion specifiers: + * s, c, d, u, o, x, X, p (and synonyms: i, D, U, O - see below) + * with flags: '-', '+', ' ', '0' and '#'. + * An asterisk is supported for field width as well as precision. + * + * Length modifiers 'h' (short int), 'l' (long int), + * and 'll' (long long int) are supported. + * NOTE: + * If macro SNPRINTF_LONGLONG_SUPPORT is not defined (default) the + * length modifier 'll' is recognized but treated the same as 'l', + * which may cause argument value truncation! Defining + * SNPRINTF_LONGLONG_SUPPORT requires that your system's sprintf also + * handles length modifier 'll'. long long int is a language extension + * which may not be portable. + * + * Conversion of numeric data (conversion specifiers d, u, o, x, X, p) + * with length modifiers (none or h, l, ll) is left to the system routine + * sprintf, but all handling of flags, field width and precision as well as + * c and s conversions is done very carefully by this portable routine. + * If a string precision (truncation) is specified (e.g. %.8s) it is + * guaranteed the string beyond the specified precision will not be referenced. + * + * Length modifiers h, l and ll are ignored for c and s conversions (data + * types wint_t and wchar_t are not supported). + * + * The following common synonyms for conversion characters are supported: + * - i is a synonym for d + * - D is a synonym for ld, explicit length modifiers are ignored + * - U is a synonym for lu, explicit length modifiers are ignored + * - O is a synonym for lo, explicit length modifiers are ignored + * The D, O and U conversion characters are nonstandard, they are supported + * for backward compatibility only, and should not be used for new code. + * + * The following is specifically NOT supported: + * - flag ' (thousands' grouping character) is recognized but ignored + * - numeric conversion specifiers: f, e, E, g, G and synonym F, + * as well as the new a and A conversion specifiers + * - length modifier 'L' (long double) and 'q' (quad - use 'll' instead) + * - wide character/string conversions: lc, ls, and nonstandard + * synonyms C and S + * - writeback of converted string length: conversion character n + * - the n$ specification for direct reference to n-th argument + * - locales + * + * It is permitted for str_m to be zero, and it is permitted to specify NULL + * pointer for resulting string argument if str_m is zero (as per ISO C99). + * + * The return value is the number of characters which would be generated + * for the given input, excluding the trailing null. If this value + * is greater or equal to str_m, not all characters from the result + * have been stored in str, output bytes beyond the (str_m-1) -th character + * are discarded. If str_m is greater than zero it is guaranteed + * the resulting string will be null-terminated. + * + * NOTE that this matches the ISO C99, OpenBSD, and GNU C library 2.1, + * but is different from some older and vendor implementations, + * and is also different from XPG, XSH5, SUSv2 specifications. + * For historical discussion on changes in the semantics and standards + * of snprintf see printf(3) man page in the Linux programmers manual. + * + * Routines asprintf and vasprintf return a pointer (in the ptr argument) + * to a buffer sufficiently large to hold the resulting string. This pointer + * should be passed to free(3) to release the allocated storage when it is + * no longer needed. If sufficient space cannot be allocated, these functions + * will return -1 and set ptr to be a NULL pointer. These two routines are a + * GNU C library extensions (glibc). + * + * Routines asnprintf and vasnprintf are similar to asprintf and vasprintf, + * yet, like snprintf and vsnprintf counterparts, will write at most str_m-1 + * characters into the allocated output string, the last character in the + * allocated buffer then gets the terminating null. If the formatted string + * length (the return value) is greater than or equal to the str_m argument, + * the resulting string was truncated and some of the formatted characters + * were discarded. These routines present a handy way to limit the amount + * of allocated memory to some sane value. + * + * AVAILABILITY + * http://www.ijs.si/software/snprintf/ + * + * REVISION HISTORY + * 1999-04 V0.9 Mark Martinec + * - initial version, some modifications after comparing printf + * man pages for Digital Unix 4.0, Solaris 2.6 and HPUX 10, + * and checking how Perl handles sprintf (differently!); + * 1999-04-09 V1.0 Mark Martinec + * - added main test program, fixed remaining inconsistencies, + * added optional (long long int) support; + * 1999-04-12 V1.1 Mark Martinec + * - support the 'p' conversion (pointer to void); + * - if a string precision is specified + * make sure the string beyond the specified precision + * will not be referenced (e.g. by strlen); + * 1999-04-13 V1.2 Mark Martinec + * - support synonyms %D=%ld, %U=%lu, %O=%lo; + * - speed up the case of long format string with few conversions; + * 1999-06-30 V1.3 Mark Martinec + * - fixed runaway loop (eventually crashing when str_l wraps + * beyond 2^31) while copying format string without + * conversion specifiers to a buffer that is too short + * (thanks to Edwin Young for + * spotting the problem); + * - added macros PORTABLE_SNPRINTF_VERSION_(MAJOR|MINOR) + * to snprintf.h + * 2000-02-14 V2.0 (never released) Mark Martinec + * - relaxed license terms: The Artistic License now applies. + * You may still apply the GNU GENERAL PUBLIC LICENSE + * as was distributed with previous versions, if you prefer; + * - changed REVISION HISTORY dates to use ISO 8601 date format; + * - added vsnprintf (patch also independently proposed by + * Caolan McNamara 2000-05-04, and Keith M Willenson 2000-06-01) + * 2000-06-27 V2.1 Mark Martinec + * - removed POSIX check for str_m<1; value 0 for str_m is + * allowed by ISO C99 (and GNU C library 2.1) - (pointed out + * on 2000-05-04 by Caolan McNamara, caolan@ csn dot ul dot ie). + * Besides relaxed license this change in standards adherence + * is the main reason to bump up the major version number; + * - added nonstandard routines asnprintf, vasnprintf, asprintf, + * vasprintf that dynamically allocate storage for the + * resulting string; these routines are not compiled by default, + * see comments where NEED_V?ASN?PRINTF macros are defined; + * - autoconf contributed by Caolan McNamara + * 2000-10-06 V2.2 Mark Martinec + * - BUG FIX: the %c conversion used a temporary variable + * that was no longer in scope when referenced, + * possibly causing incorrect resulting character; + * - BUG FIX: make precision and minimal field width unsigned + * to handle huge values (2^31 <= n < 2^32) correctly; + * also be more careful in the use of signed/unsigned/size_t + * internal variables - probably more careful than many + * vendor implementations, but there may still be a case + * where huge values of str_m, precision or minimal field + * could cause incorrect behaviour; + * - use separate variables for signed/unsigned arguments, + * and for short/int, long, and long long argument lengths + * to avoid possible incompatibilities on certain + * computer architectures. Also use separate variable + * arg_sign to hold sign of a numeric argument, + * to make code more transparent; + * - some fiddling with zero padding and "0x" to make it + * Linux compatible; + * - systematically use macros fast_memcpy and fast_memset + * instead of case-by-case hand optimization; determine some + * breakeven string lengths for different architectures; + * - terminology change: 'format' -> 'conversion specifier', + * 'C9x' -> 'ISO/IEC 9899:1999 ("ISO C99")', + * 'alternative form' -> 'alternate form', + * 'data type modifier' -> 'length modifier'; + * - several comments rephrased and new ones added; + * - make compiler not complain about 'credits' defined but + * not used; + */ + + +/* Define HAVE_SNPRINTF if your system already has snprintf and vsnprintf. + * + * If HAVE_SNPRINTF is defined this module will not produce code for + * snprintf and vsnprintf, unless PREFER_PORTABLE_SNPRINTF is defined as well, + * causing this portable version of snprintf to be called portable_snprintf + * (and portable_vsnprintf). + */ +/* #define HAVE_SNPRINTF */ + +/* Define PREFER_PORTABLE_SNPRINTF if your system does have snprintf and + * vsnprintf but you would prefer to use the portable routine(s) instead. + * In this case the portable routine is declared as portable_snprintf + * (and portable_vsnprintf) and a macro 'snprintf' (and 'vsnprintf') + * is defined to expand to 'portable_v?snprintf' - see file snprintf.h . + * Defining this macro is only useful if HAVE_SNPRINTF is also defined, + * but does does no harm if defined nevertheless. + */ +/* #define PREFER_PORTABLE_SNPRINTF */ + +/* Define SNPRINTF_LONGLONG_SUPPORT if you want to support + * data type (long long int) and length modifier 'll' (e.g. %lld). + * If undefined, 'll' is recognized but treated as a single 'l'. + * + * If the system's sprintf does not handle 'll' + * the SNPRINTF_LONGLONG_SUPPORT must not be defined! + * + * This is off by default as (long long int) is a language extension. + */ +/* #define SNPRINTF_LONGLONG_SUPPORT */ + +/* Define NEED_SNPRINTF_ONLY if you only need snprintf, and not vsnprintf. + * If NEED_SNPRINTF_ONLY is defined, the snprintf will be defined directly, + * otherwise both snprintf and vsnprintf routines will be defined + * and snprintf will be a simple wrapper around vsnprintf, at the expense + * of an extra procedure call. + */ +/* #define NEED_SNPRINTF_ONLY */ + +/* Define NEED_V?ASN?PRINTF macros if you need library extension + * routines asprintf, vasprintf, asnprintf, vasnprintf respectively, + * and your system library does not provide them. They are all small + * wrapper routines around portable_vsnprintf. Defining any of the four + * NEED_V?ASN?PRINTF macros automatically turns off NEED_SNPRINTF_ONLY + * and turns on PREFER_PORTABLE_SNPRINTF. + * + * Watch for name conflicts with the system library if these routines + * are already present there. + * + * NOTE: vasprintf and vasnprintf routines need va_copy() from stdarg.h, as + * specified by C99, to be able to traverse the same list of arguments twice. + * I don't know of any other standard and portable way of achieving the same. + * With some versions of gcc you may use __va_copy(). You might even get away + * with "ap2 = ap", in this case you must not call va_end(ap2) ! + * #define va_copy(ap2,ap) ap2 = ap + */ +/* #define NEED_ASPRINTF */ +/* #define NEED_ASNPRINTF */ +/* #define NEED_VASPRINTF */ +/* #define NEED_VASNPRINTF */ + + +/* Define the following macros if desired: + * SOLARIS_COMPATIBLE, SOLARIS_BUG_COMPATIBLE, + * HPUX_COMPATIBLE, HPUX_BUG_COMPATIBLE, LINUX_COMPATIBLE, + * DIGITAL_UNIX_COMPATIBLE, DIGITAL_UNIX_BUG_COMPATIBLE, + * PERL_COMPATIBLE, PERL_BUG_COMPATIBLE, + * + * - For portable applications it is best not to rely on peculiarities + * of a given implementation so it may be best not to define any + * of the macros that select compatibility and to avoid features + * that vary among the systems. + * + * - Selecting compatibility with more than one operating system + * is not strictly forbidden but is not recommended. + * + * - 'x'_BUG_COMPATIBLE implies 'x'_COMPATIBLE . + * + * - 'x'_COMPATIBLE refers to (and enables) a behaviour that is + * documented in a sprintf man page on a given operating system + * and actually adhered to by the system's sprintf (but not on + * most other operating systems). It may also refer to and enable + * a behaviour that is declared 'undefined' or 'implementation specific' + * in the man page but a given implementation behaves predictably + * in a certain way. + * + * - 'x'_BUG_COMPATIBLE refers to (and enables) a behaviour of system's sprintf + * that contradicts the sprintf man page on the same operating system. + * + * - I do not claim that the 'x'_COMPATIBLE and 'x'_BUG_COMPATIBLE + * conditionals take into account all idiosyncrasies of a particular + * implementation, there may be other incompatibilities. + */ + + + +/* ============================================= */ +/* NO USER SERVICABLE PARTS FOLLOWING THIS POINT */ +/* ============================================= */ + +#define PORTABLE_SNPRINTF_VERSION_MAJOR 2 +#define PORTABLE_SNPRINTF_VERSION_MINOR 2 + +#if defined(NEED_ASPRINTF) || defined(NEED_ASNPRINTF) || defined(NEED_VASPRINTF) || defined(NEED_VASNPRINTF) +# if defined(NEED_SNPRINTF_ONLY) +# undef NEED_SNPRINTF_ONLY +# endif +# if !defined(PREFER_PORTABLE_SNPRINTF) +# define PREFER_PORTABLE_SNPRINTF +# endif +#endif + +#if defined(SOLARIS_BUG_COMPATIBLE) && !defined(SOLARIS_COMPATIBLE) +#define SOLARIS_COMPATIBLE +#endif + +#if defined(HPUX_BUG_COMPATIBLE) && !defined(HPUX_COMPATIBLE) +#define HPUX_COMPATIBLE +#endif + +#if defined(DIGITAL_UNIX_BUG_COMPATIBLE) && !defined(DIGITAL_UNIX_COMPATIBLE) +#define DIGITAL_UNIX_COMPATIBLE +#endif + +#if defined(PERL_BUG_COMPATIBLE) && !defined(PERL_COMPATIBLE) +#define PERL_COMPATIBLE +#endif + +#if defined(LINUX_BUG_COMPATIBLE) && !defined(LINUX_COMPATIBLE) +#define LINUX_COMPATIBLE +#endif + +#include +#include +#include +#include +#include +#include +#include + +#ifdef isdigit +#undef isdigit +#endif +#define isdigit(c) ((c) >= '0' && (c) <= '9') + +/* For copying strings longer or equal to 'breakeven_point' + * it is more efficient to call memcpy() than to do it inline. + * The value depends mostly on the processor architecture, + * but also on the compiler and its optimization capabilities. + * The value is not critical, some small value greater than zero + * will be just fine if you don't care to squeeze every drop + * of performance out of the code. + * + * Small values favor memcpy, large values favor inline code. + */ +#if defined(__alpha__) || defined(__alpha) +# define breakeven_point 2 /* AXP (DEC Alpha) - gcc or cc or egcs */ +#endif +#if defined(__i386__) || defined(__i386) +# define breakeven_point 12 /* Intel Pentium/Linux - gcc 2.96 */ +#endif +#if defined(__hppa) +# define breakeven_point 10 /* HP-PA - gcc */ +#endif +#if defined(__sparc__) || defined(__sparc) +# define breakeven_point 33 /* Sun Sparc 5 - gcc 2.8.1 */ +#endif + +/* some other values of possible interest: */ +/* #define breakeven_point 8 */ /* VAX 4000 - vaxc */ +/* #define breakeven_point 19 */ /* VAX 4000 - gcc 2.7.0 */ + +#ifndef breakeven_point +# define breakeven_point 6 /* some reasonable one-size-fits-all value */ +#endif + +#define fast_memcpy(d,s,n) \ + { register size_t nn = (size_t)(n); \ + if (nn >= breakeven_point) memcpy((d), (s), nn); \ + else if (nn > 0) { /* proc call overhead is worth only for large strings*/\ + register char *dd; register const char *ss; \ + for (ss=(s), dd=(d); nn>0; nn--) *dd++ = *ss++; } } + +#define fast_memset(d,c,n) \ + { register size_t nn = (size_t)(n); \ + if (nn >= breakeven_point) memset((d), (int)(c), nn); \ + else if (nn > 0) { /* proc call overhead is worth only for large strings*/\ + register char *dd; register const int cc=(int)(c); \ + for (dd=(d); nn>0; nn--) *dd++ = cc; } } + +/* prototypes */ + +#if defined(NEED_ASPRINTF) +int asprintf (char **ptr, const char *fmt, /*args*/ ...); +#endif +#if defined(NEED_VASPRINTF) +int vasprintf (char **ptr, const char *fmt, va_list ap); +#endif +#if defined(NEED_ASNPRINTF) +int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...); +#endif +#if defined(NEED_VASNPRINTF) +int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap); +#endif + +#if defined(HAVE_SNPRINTF) +/* declare our portable snprintf routine under name portable_snprintf */ +/* declare our portable vsnprintf routine under name portable_vsnprintf */ +#else +/* declare our portable routines under names snprintf and vsnprintf */ +#define portable_snprintf snprintf +#if !defined(NEED_SNPRINTF_ONLY) +#define portable_vsnprintf vsnprintf +#endif +#endif + +#if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) +int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...); +#if !defined(NEED_SNPRINTF_ONLY) +int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap); +#endif +#endif + +/* declarations */ + +static char credits[] = "\n\ +@(#)snprintf.c, v2.2: Mark Martinec, \n\ +@(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic License applies.\n\ +@(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n"; + +#if defined(NEED_ASPRINTF) +int asprintf(char **ptr, const char *fmt, /*args*/ ...) { + va_list ap; + size_t str_m; + int str_l; + + *ptr = NULL; + va_start(ap, fmt); /* measure the required size */ + str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap); + va_end(ap); + assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ + *ptr = (char *) malloc(str_m = (size_t)str_l + 1); + if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } + else { + int str_l2; + va_start(ap, fmt); + str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); + va_end(ap); + assert(str_l2 == str_l); + } + return str_l; +} +#endif + +#if defined(NEED_VASPRINTF) +int vasprintf(char **ptr, const char *fmt, va_list ap) { + size_t str_m; + int str_l; + + *ptr = NULL; + { va_list ap2; + va_copy(ap2, ap); /* don't consume the original ap, we'll need it again */ + str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap2);/*get required size*/ + va_end(ap2); + } + assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ + *ptr = (char *) malloc(str_m = (size_t)str_l + 1); + if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } + else { + int str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); + assert(str_l2 == str_l); + } + return str_l; +} +#endif + +#if defined(NEED_ASNPRINTF) +int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...) { + va_list ap; + int str_l; + + *ptr = NULL; + va_start(ap, fmt); /* measure the required size */ + str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap); + va_end(ap); + assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ + if ((size_t)str_l + 1 < str_m) str_m = (size_t)str_l + 1; /* truncate */ + /* if str_m is 0, no buffer is allocated, just set *ptr to NULL */ + if (str_m == 0) { /* not interested in resulting string, just return size */ + } else { + *ptr = (char *) malloc(str_m); + if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } + else { + int str_l2; + va_start(ap, fmt); + str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); + va_end(ap); + assert(str_l2 == str_l); + } + } + return str_l; +} +#endif + +#if defined(NEED_VASNPRINTF) +int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap) { + int str_l; + + *ptr = NULL; + { va_list ap2; + va_copy(ap2, ap); /* don't consume the original ap, we'll need it again */ + str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap2);/*get required size*/ + va_end(ap2); + } + assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ + if ((size_t)str_l + 1 < str_m) str_m = (size_t)str_l + 1; /* truncate */ + /* if str_m is 0, no buffer is allocated, just set *ptr to NULL */ + if (str_m == 0) { /* not interested in resulting string, just return size */ + } else { + *ptr = (char *) malloc(str_m); + if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } + else { + int str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); + assert(str_l2 == str_l); + } + } + return str_l; +} +#endif + +/* + * If the system does have snprintf and the portable routine is not + * specifically required, this module produces no code for snprintf/vsnprintf. + */ +#if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) + +#if !defined(NEED_SNPRINTF_ONLY) +int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...) { + va_list ap; + int str_l; + + va_start(ap, fmt); + str_l = portable_vsnprintf(str, str_m, fmt, ap); + va_end(ap); + return str_l; +} +#endif + +#if defined(NEED_SNPRINTF_ONLY) +int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...) { +#else +int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { +#endif + +#if defined(NEED_SNPRINTF_ONLY) + va_list ap; +#endif + size_t str_l = 0; + const char *p = fmt; + +/* In contrast with POSIX, the ISO C99 now says + * that str can be NULL and str_m can be 0. + * This is more useful than the old: if (str_m < 1) return -1; */ + +#if defined(NEED_SNPRINTF_ONLY) + va_start(ap, fmt); +#endif + if (!p) p = ""; + while (*p) { + if (*p != '%') { + /* if (str_l < str_m) str[str_l++] = *p++; -- this would be sufficient */ + /* but the following code achieves better performance for cases + * where format string is long and contains few conversions */ + const char *q = strchr(p+1,'%'); + size_t n = !q ? strlen(p) : (q-p); + if (str_l < str_m) { + size_t avail = str_m-str_l; + fast_memcpy(str+str_l, p, (n>avail?avail:n)); + } + p += n; str_l += n; + } else { + const char *starting_p; + size_t min_field_width = 0, precision = 0; + int zero_padding = 0, precision_specified = 0, justify_left = 0; + int alternate_form = 0, force_sign = 0; + int space_for_positive = 1; /* If both the ' ' and '+' flags appear, + the ' ' flag should be ignored. */ + char length_modifier = '\0'; /* allowed values: \0, h, l, L */ + char tmp[32];/* temporary buffer for simple numeric->string conversion */ + + const char *str_arg; /* string address in case of string argument */ + size_t str_arg_l; /* natural field width of arg without padding + and sign */ + unsigned char uchar_arg; + /* unsigned char argument value - only defined for c conversion. + N.B. standard explicitly states the char argument for + the c conversion is unsigned */ + + size_t number_of_zeros_to_pad = 0; + /* number of zeros to be inserted for numeric conversions + as required by the precision or minimal field width */ + + size_t zero_padding_insertion_ind = 0; + /* index into tmp where zero padding is to be inserted */ + + char fmt_spec = '\0'; + /* current conversion specifier character */ + + str_arg = credits;/* just to make compiler happy (defined but not used)*/ + str_arg = NULL; + starting_p = p; p++; /* skip '%' */ + /* parse flags */ + while (*p == '0' || *p == '-' || *p == '+' || + *p == ' ' || *p == '#' || *p == '\'') { + switch (*p) { + case '0': zero_padding = 1; break; + case '-': justify_left = 1; break; + case '+': force_sign = 1; space_for_positive = 0; break; + case ' ': force_sign = 1; + /* If both the ' ' and '+' flags appear, the ' ' flag should be ignored */ +#ifdef PERL_COMPATIBLE + /* ... but in Perl the last of ' ' and '+' applies */ + space_for_positive = 1; +#endif + break; + case '#': alternate_form = 1; break; + case '\'': break; + } + p++; + } + /* If the '0' and '-' flags both appear, the '0' flag should be ignored. */ + + /* parse field width */ + if (*p == '*') { + int j; + p++; j = va_arg(ap, int); + if (j >= 0) min_field_width = j; + else { min_field_width = -j; justify_left = 1; } + } else if (isdigit((int)(*p))) { + /* size_t could be wider than unsigned int; + make sure we treat argument like common implementations do */ + unsigned int uj = *p++ - '0'; + while (isdigit((int)(*p))) uj = 10*uj + (unsigned int)(*p++ - '0'); + min_field_width = uj; + } + /* parse precision */ + if (*p == '.') { + p++; precision_specified = 1; + if (*p == '*') { + int j = va_arg(ap, int); + p++; + if (j >= 0) precision = j; + else { + precision_specified = 0; precision = 0; + /* NOTE: + * Solaris 2.6 man page claims that in this case the precision + * should be set to 0. Digital Unix 4.0, HPUX 10 and BSD man page + * claim that this case should be treated as unspecified precision, + * which is what we do here. + */ + } + } else if (isdigit((int)(*p))) { + /* size_t could be wider than unsigned int; + make sure we treat argument like common implementations do */ + unsigned int uj = *p++ - '0'; + while (isdigit((int)(*p))) uj = 10*uj + (unsigned int)(*p++ - '0'); + precision = uj; + } + } + /* parse 'h', 'l' and 'll' length modifiers */ + if (*p == 'h' || *p == 'l') { + length_modifier = *p; p++; + if (length_modifier == 'l' && *p == 'l') { /* double l = long long */ +#ifdef SNPRINTF_LONGLONG_SUPPORT + length_modifier = '2'; /* double l encoded as '2' */ +#else + length_modifier = 'l'; /* treat it as a single 'l' */ +#endif + p++; + } + } + fmt_spec = *p; + /* common synonyms: */ + switch (fmt_spec) { + case 'i': fmt_spec = 'd'; break; + case 'D': fmt_spec = 'd'; length_modifier = 'l'; break; + case 'U': fmt_spec = 'u'; length_modifier = 'l'; break; + case 'O': fmt_spec = 'o'; length_modifier = 'l'; break; + default: break; + } + /* get parameter value, do initial processing */ + switch (fmt_spec) { + case '%': /* % behaves similar to 's' regarding flags and field widths */ + case 'c': /* c behaves similar to 's' regarding flags and field widths */ + case 's': + length_modifier = '\0'; /* wint_t and wchar_t not supported */ + /* the result of zero padding flag with non-numeric conversion specifier*/ + /* is undefined. Solaris and HPUX 10 does zero padding in this case, */ + /* Digital Unix and Linux does not. */ +#if !defined(SOLARIS_COMPATIBLE) && !defined(HPUX_COMPATIBLE) + zero_padding = 0; /* turn zero padding off for string conversions */ +#endif + str_arg_l = 1; + switch (fmt_spec) { + case '%': + str_arg = p; break; + case 'c': { + int j = va_arg(ap, int); + uchar_arg = (unsigned char) j; /* standard demands unsigned char */ + str_arg = (const char *) &uchar_arg; + break; + } + case 's': + str_arg = va_arg(ap, const char *); + if (!str_arg) str_arg_l = 0; + /* make sure not to address string beyond the specified precision !!! */ + else if (!precision_specified) str_arg_l = strlen(str_arg); + /* truncate string if necessary as requested by precision */ + else if (precision == 0) str_arg_l = 0; + else { + /* memchr on HP does not like n > 2^31 !!! */ + const char *q = memchr(str_arg, '\0', + precision <= 0x7fffffff ? precision : 0x7fffffff); + str_arg_l = !q ? precision : (q-str_arg); + } + break; + default: break; + } + break; + case 'd': case 'u': case 'o': case 'x': case 'X': case 'p': { + /* NOTE: the u, o, x, X and p conversion specifiers imply + the value is unsigned; d implies a signed value */ + + int arg_sign = 0; + /* 0 if numeric argument is zero (or if pointer is NULL for 'p'), + +1 if greater than zero (or nonzero for unsigned arguments), + -1 if negative (unsigned argument is never negative) */ + + int int_arg = 0; unsigned int uint_arg = 0; + /* only defined for length modifier h, or for no length modifiers */ + + long int long_arg = 0; unsigned long int ulong_arg = 0; + /* only defined for length modifier l */ + + void *ptr_arg = NULL; + /* pointer argument value -only defined for p conversion */ + +#ifdef SNPRINTF_LONGLONG_SUPPORT + long long int long_long_arg = 0; + unsigned long long int ulong_long_arg = 0; + /* only defined for length modifier ll */ +#endif + if (fmt_spec == 'p') { + /* HPUX 10: An l, h, ll or L before any other conversion character + * (other than d, i, u, o, x, or X) is ignored. + * Digital Unix: + * not specified, but seems to behave as HPUX does. + * Solaris: If an h, l, or L appears before any other conversion + * specifier (other than d, i, u, o, x, or X), the behavior + * is undefined. (Actually %hp converts only 16-bits of address + * and %llp treats address as 64-bit data which is incompatible + * with (void *) argument on a 32-bit system). + */ +#ifdef SOLARIS_COMPATIBLE +# ifdef SOLARIS_BUG_COMPATIBLE + /* keep length modifiers even if it represents 'll' */ +# else + if (length_modifier == '2') length_modifier = '\0'; +# endif +#else + length_modifier = '\0'; +#endif + ptr_arg = va_arg(ap, void *); + if (ptr_arg != NULL) arg_sign = 1; + } else if (fmt_spec == 'd') { /* signed */ + switch (length_modifier) { + case '\0': + case 'h': + /* It is non-portable to specify a second argument of char or short + * to va_arg, because arguments seen by the called function + * are not char or short. C converts char and short arguments + * to int before passing them to a function. + */ + int_arg = va_arg(ap, int); + if (int_arg > 0) arg_sign = 1; + else if (int_arg < 0) arg_sign = -1; + break; + case 'l': + long_arg = va_arg(ap, long int); + if (long_arg > 0) arg_sign = 1; + else if (long_arg < 0) arg_sign = -1; + break; +#ifdef SNPRINTF_LONGLONG_SUPPORT + case '2': + long_long_arg = va_arg(ap, long long int); + if (long_long_arg > 0) arg_sign = 1; + else if (long_long_arg < 0) arg_sign = -1; + break; +#endif + } + } else { /* unsigned */ + switch (length_modifier) { + case '\0': + case 'h': + uint_arg = va_arg(ap, unsigned int); + if (uint_arg) arg_sign = 1; + break; + case 'l': + ulong_arg = va_arg(ap, unsigned long int); + if (ulong_arg) arg_sign = 1; + break; +#ifdef SNPRINTF_LONGLONG_SUPPORT + case '2': + ulong_long_arg = va_arg(ap, unsigned long long int); + if (ulong_long_arg) arg_sign = 1; + break; +#endif + } + } + str_arg = tmp; str_arg_l = 0; + /* NOTE: + * For d, i, u, o, x, and X conversions, if precision is specified, + * the '0' flag should be ignored. This is so with Solaris 2.6, + * Digital UNIX 4.0, HPUX 10, Linux, FreeBSD, NetBSD; but not with Perl. + */ +#ifndef PERL_COMPATIBLE + if (precision_specified) zero_padding = 0; +#endif + if (fmt_spec == 'd') { + if (force_sign && arg_sign >= 0) + tmp[str_arg_l++] = space_for_positive ? ' ' : '+'; + /* leave negative numbers for sprintf to handle, + to avoid handling tricky cases like (short int)(-32768) */ +#ifdef LINUX_COMPATIBLE + } else if (fmt_spec == 'p' && force_sign && arg_sign > 0) { + tmp[str_arg_l++] = space_for_positive ? ' ' : '+'; +#endif + } else if (alternate_form) { + if (arg_sign != 0 && (fmt_spec == 'x' || fmt_spec == 'X') ) + { tmp[str_arg_l++] = '0'; tmp[str_arg_l++] = fmt_spec; } + /* alternate form should have no effect for p conversion, but ... */ +#ifdef HPUX_COMPATIBLE + else if (fmt_spec == 'p' + /* HPUX 10: for an alternate form of p conversion, + * a nonzero result is prefixed by 0x. */ +#ifndef HPUX_BUG_COMPATIBLE + /* Actually it uses 0x prefix even for a zero value. */ + && arg_sign != 0 +#endif + ) { tmp[str_arg_l++] = '0'; tmp[str_arg_l++] = 'x'; } +#endif + } + zero_padding_insertion_ind = str_arg_l; + if (!precision_specified) precision = 1; /* default precision is 1 */ + if (precision == 0 && arg_sign == 0 +#if defined(HPUX_BUG_COMPATIBLE) || defined(LINUX_COMPATIBLE) + && fmt_spec != 'p' + /* HPUX 10 man page claims: With conversion character p the result of + * converting a zero value with a precision of zero is a null string. + * Actually HP returns all zeroes, and Linux returns "(nil)". */ +#endif + ) { + /* converted to null string */ + /* When zero value is formatted with an explicit precision 0, + the resulting formatted string is empty (d, i, u, o, x, X, p). */ + } else { + char f[5]; int f_l = 0; + f[f_l++] = '%'; /* construct a simple format string for sprintf */ + if (!length_modifier) { } + else if (length_modifier=='2') { f[f_l++] = 'l'; f[f_l++] = 'l'; } + else f[f_l++] = length_modifier; + f[f_l++] = fmt_spec; f[f_l++] = '\0'; + if (fmt_spec == 'p') str_arg_l += sprintf(tmp+str_arg_l, f, ptr_arg); + else if (fmt_spec == 'd') { /* signed */ + switch (length_modifier) { + case '\0': + case 'h': str_arg_l+=sprintf(tmp+str_arg_l, f, int_arg); break; + case 'l': str_arg_l+=sprintf(tmp+str_arg_l, f, long_arg); break; +#ifdef SNPRINTF_LONGLONG_SUPPORT + case '2': str_arg_l+=sprintf(tmp+str_arg_l,f,long_long_arg); break; +#endif + } + } else { /* unsigned */ + switch (length_modifier) { + case '\0': + case 'h': str_arg_l+=sprintf(tmp+str_arg_l, f, uint_arg); break; + case 'l': str_arg_l+=sprintf(tmp+str_arg_l, f, ulong_arg); break; +#ifdef SNPRINTF_LONGLONG_SUPPORT + case '2': str_arg_l+=sprintf(tmp+str_arg_l,f,ulong_long_arg);break; +#endif + } + } + /* include the optional minus sign and possible "0x" + in the region before the zero padding insertion point */ + if (zero_padding_insertion_ind < str_arg_l && + tmp[zero_padding_insertion_ind] == '-') { + zero_padding_insertion_ind++; + } + if (zero_padding_insertion_ind+1 < str_arg_l && + tmp[zero_padding_insertion_ind] == '0' && + (tmp[zero_padding_insertion_ind+1] == 'x' || + tmp[zero_padding_insertion_ind+1] == 'X') ) { + zero_padding_insertion_ind += 2; + } + } + { size_t num_of_digits = str_arg_l - zero_padding_insertion_ind; + if (alternate_form && fmt_spec == 'o' +#ifdef HPUX_COMPATIBLE /* ("%#.o",0) -> "" */ + && (str_arg_l > 0) +#endif +#ifdef DIGITAL_UNIX_BUG_COMPATIBLE /* ("%#o",0) -> "00" */ +#else + /* unless zero is already the first character */ + && !(zero_padding_insertion_ind < str_arg_l + && tmp[zero_padding_insertion_ind] == '0') +#endif + ) { /* assure leading zero for alternate-form octal numbers */ + if (!precision_specified || precision < num_of_digits+1) { + /* precision is increased to force the first character to be zero, + except if a zero value is formatted with an explicit precision + of zero */ + precision = num_of_digits+1; precision_specified = 1; + } + } + /* zero padding to specified precision? */ + if (num_of_digits < precision) + number_of_zeros_to_pad = precision - num_of_digits; + } + /* zero padding to specified minimal field width? */ + if (!justify_left && zero_padding) { + int n = min_field_width - (str_arg_l+number_of_zeros_to_pad); + if (n > 0) number_of_zeros_to_pad += n; + } + break; + } + default: /* unrecognized conversion specifier, keep format string as-is*/ + zero_padding = 0; /* turn zero padding off for non-numeric convers. */ +#ifndef DIGITAL_UNIX_COMPATIBLE + justify_left = 1; min_field_width = 0; /* reset flags */ +#endif +#if defined(PERL_COMPATIBLE) || defined(LINUX_COMPATIBLE) + /* keep the entire format string unchanged */ + str_arg = starting_p; str_arg_l = p - starting_p; + /* well, not exactly so for Linux, which does something inbetween, + * and I don't feel an urge to imitate it: "%+++++hy" -> "%+y" */ +#else + /* discard the unrecognized conversion, just keep * + * the unrecognized conversion character */ + str_arg = p; str_arg_l = 0; +#endif + if (*p) str_arg_l++; /* include invalid conversion specifier unchanged + if not at end-of-string */ + break; + } + if (*p) p++; /* step over the just processed conversion specifier */ + /* insert padding to the left as requested by min_field_width; + this does not include the zero padding in case of numerical conversions*/ + if (!justify_left) { /* left padding with blank or zero */ + int n = min_field_width - (str_arg_l+number_of_zeros_to_pad); + if (n > 0) { + if (str_l < str_m) { + size_t avail = str_m-str_l; + fast_memset(str+str_l, (zero_padding?'0':' '), (n>avail?avail:n)); + } + str_l += n; + } + } + /* zero padding as requested by the precision or by the minimal field width + * for numeric conversions required? */ + if (number_of_zeros_to_pad <= 0) { + /* will not copy first part of numeric right now, * + * force it to be copied later in its entirety */ + zero_padding_insertion_ind = 0; + } else { + /* insert first part of numerics (sign or '0x') before zero padding */ + int n = zero_padding_insertion_ind; + if (n > 0) { + if (str_l < str_m) { + size_t avail = str_m-str_l; + fast_memcpy(str+str_l, str_arg, (n>avail?avail:n)); + } + str_l += n; + } + /* insert zero padding as requested by the precision or min field width */ + n = number_of_zeros_to_pad; + if (n > 0) { + if (str_l < str_m) { + size_t avail = str_m-str_l; + fast_memset(str+str_l, '0', (n>avail?avail:n)); + } + str_l += n; + } + } + /* insert formatted string + * (or as-is conversion specifier for unknown conversions) */ + { int n = str_arg_l - zero_padding_insertion_ind; + if (n > 0) { + if (str_l < str_m) { + size_t avail = str_m-str_l; + fast_memcpy(str+str_l, str_arg+zero_padding_insertion_ind, + (n>avail?avail:n)); + } + str_l += n; + } + } + /* insert right padding */ + if (justify_left) { /* right blank padding to the field width */ + int n = min_field_width - (str_arg_l+number_of_zeros_to_pad); + if (n > 0) { + if (str_l < str_m) { + size_t avail = str_m-str_l; + fast_memset(str+str_l, ' ', (n>avail?avail:n)); + } + str_l += n; + } + } + } + } +#if defined(NEED_SNPRINTF_ONLY) + va_end(ap); +#endif + if (str_m > 0) { /* make sure the string is null-terminated + even at the expense of overwriting the last character + (shouldn't happen, but just in case) */ + str[str_l <= str_m-1 ? str_l : str_m-1] = '\0'; + } + /* Return the number of characters formatted (excluding trailing null + * character), that is, the number of characters that would have been + * written to the buffer if it were large enough. + * + * The value of str_l should be returned, but str_l is of unsigned type + * size_t, and snprintf is int, possibly leading to an undetected + * integer overflow, resulting in a negative return value, which is illegal. + * Both XSH5 and ISO C99 (at least the draft) are silent on this issue. + * Should errno be set to EOVERFLOW and EOF returned in this case??? + */ + return (int) str_l; +} +#endif Added: csw/mgar/pkg/watch/trunk/files/snprintf.h =================================================================== --- csw/mgar/pkg/watch/trunk/files/snprintf.h (rev 0) +++ csw/mgar/pkg/watch/trunk/files/snprintf.h 2009-03-04 00:28:48 UTC (rev 3575) @@ -0,0 +1,26 @@ +#ifndef _PORTABLE_SNPRINTF_H_ +#define _PORTABLE_SNPRINTF_H_ + +#define PORTABLE_SNPRINTF_VERSION_MAJOR 2 +#define PORTABLE_SNPRINTF_VERSION_MINOR 2 + +#ifdef HAVE_SNPRINTF +#include +#else +extern int snprintf(char *, size_t, const char *, /*args*/ ...); +extern int vsnprintf(char *, size_t, const char *, va_list); +#endif + +#if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF) +extern int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...); +extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap); +#define snprintf portable_snprintf +#define vsnprintf portable_vsnprintf +#endif + +extern int asprintf (char **ptr, const char *fmt, /*args*/ ...); +extern int vasprintf (char **ptr, const char *fmt, va_list ap); +extern int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...); +extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap); + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Mar 4 12:50:34 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 04 Mar 2009 11:50:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3576] csw/mgar/pkg/nrpe/trunk/Makefile Message-ID: Revision: 3576 http://gar.svn.sourceforge.net/gar/?rev=3576&view=rev Author: j_arndt Date: 2009-03-04 11:50:34 +0000 (Wed, 04 Mar 2009) Log Message: ----------- nrpe: fixed SF_PROJ Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-04 00:28:48 UTC (rev 3575) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-04 11:50:34 UTC (rev 3576) @@ -7,6 +7,7 @@ NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. endef +SF_PROJ = nagios MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall postinstall preremove ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Wed Mar 4 13:02:59 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Wed, 04 Mar 2009 12:02:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[3577] csw/mgar/pkg Message-ID: Revision: 3577 http://gar.svn.sourceforge.net/gar/?rev=3577&view=rev Author: glawsf Date: 2009-03-04 12:02:59 +0000 (Wed, 04 Mar 2009) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/djbdns/ csw/mgar/pkg/djbdns/Makefile csw/mgar/pkg/djbdns/tags/ csw/mgar/pkg/djbdns/trunk/ Added: csw/mgar/pkg/djbdns/Makefile =================================================================== --- csw/mgar/pkg/djbdns/Makefile (rev 0) +++ csw/mgar/pkg/djbdns/Makefile 2009-03-04 12:02:59 UTC (rev 3577) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Wed Mar 4 13:05:48 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Wed, 04 Mar 2009 12:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3578] csw/mgar/pkg/djbdns Message-ID: Revision: 3578 http://gar.svn.sourceforge.net/gar/?rev=3578&view=rev Author: glawsf Date: 2009-03-04 12:05:48 +0000 (Wed, 04 Mar 2009) Log Message: ----------- more files Added Paths: ----------- csw/mgar/pkg/djbdns/branches/ csw/mgar/pkg/djbdns/trunk/Makefile csw/mgar/pkg/djbdns/trunk/checksums csw/mgar/pkg/djbdns/trunk/files/ csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec Added: csw/mgar/pkg/djbdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/djbdns/trunk/Makefile (rev 0) +++ csw/mgar/pkg/djbdns/trunk/Makefile 2009-03-04 12:05:48 UTC (rev 3578) @@ -0,0 +1,69 @@ +GARNAME = djbdns +GARVERSION = 1.05 +CATEGORIES = apps + +DESCRIPTION = retrieve and publish Domain Name System information +define BLURB +djbdns is a collection of Domain Name System tools. It includes several +components: + + * The dnscache program is a local DNS cache. It accepts recursive DNS + queries from local clients such as web browsers. It collects responses + from remote DNS servers. + * The tinydns program is a fast, UDP-only DNS server. It makes local DNS + information available to the Internet. It supports load balancing and + client differentation. + * The walldns program is a reverse DNS wall. It provides matching reverse + and forward records while hiding local host information. + * The rbldns program is an IP-address-listing DNS server. It uses DNS to + publish a list of IP addresses, such as RBL or DUL. + * The dns library handles outgoing and incoming DNS packets. It can be + used by clients such as web browsers to look up host addresses, hot names, + MX records, etc. It supports asynchronous resolution. + * The dnsfilter program is a parallel IP-address-to-host-name converter. + * The dnsip, dnsipq, dnsname, dnstxt, and dnsmx programs are simple + command-line interfaces to DNS. + * The dnsq and dnstrace programs are DNS debugging tools. + +If you wish to replicate DNS information to secondary djbdns servers, you will +also need to install openssh and rsync to perform the actual replication. +This is not required unless you want to replicate to a secondary djbdns server +and is not required if your secondary is a BIND DNS server. +endef + +MASTER_SITES = http://cr.yp.to/djbdns/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWdjbdns,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +FILES = axfr-get axfrdns axfrdns-conf dnscache dnscache-conf dnsfilter dnsip dnsipq dnsmx dnsname dnsq dnsqr dnstrace dnstracesort dnstxt pickdns pickdns-conf pickdns-data random-ip rbldns rbldns-conf rbldns-data tinydns tinydns-conf tinydns-data tinydns-edit tinydns-get walldns walldns-conf + +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = custom +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +configure-custom: + @echo "==> Configuring $(GARNAME)" + @cd $(WORKSRC)/ && sed "s|/usr/local|$(prefix)|g" < conf-home > conf-home.csw && mv conf-home.csw conf-home + @$(MAKECOOKIE) + +build-custom: + @echo "==> building $(GARNAME)" + @cd $(WORKSRC) && PATH=/opt/csw/gnu:/opt/csw/gcc3/bin/:/usr/bin/:$PATH && export PATH && make + @$(MAKECOOKIE) + +install-custom: + @echo "==> installing $(GARNAME)" + @echo "==> to $(DESTDIR)$(prefix)/bin" + @rm -rf $(DESTDIR)$(prefix) + @mkdir -p $(DESTDIR)$(prefix)/bin + @ginstall -m 755 $(foreach FILE, $(FILES), $(WORKSRC)/$(FILE)) $(DESTDIR)$(prefix)/bin + @$(MAKECOOKIE) Added: csw/mgar/pkg/djbdns/trunk/checksums =================================================================== --- csw/mgar/pkg/djbdns/trunk/checksums (rev 0) +++ csw/mgar/pkg/djbdns/trunk/checksums 2009-03-04 12:05:48 UTC (rev 3578) @@ -0,0 +1,2 @@ +3147c5cd56832aa3b41955c7a51cbeb2 download/djbdns-1.05.tar.gz +913166e653d2c5f026e8a0eccffb39bb download/CSWdjbdns.gspec Added: csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec =================================================================== --- csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec (rev 0) +++ csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec 2009-03-04 12:05:48 UTC (rev 3578) @@ -0,0 +1,5 @@ +%var bitname djbdns +%var pkgname CSWdjbdns +%var hotline http://www.opencsw.org/bugtrack +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From glawsf at users.sourceforge.net Wed Mar 4 14:41:59 2009 From: glawsf at users.sourceforge.net (glawsf at users.sourceforge.net) Date: Wed, 04 Mar 2009 13:41:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[3579] csw/mgar/pkg/rl/trunk Message-ID: Revision: 3579 http://gar.svn.sourceforge.net/gar/?rev=3579&view=rev Author: glawsf Date: 2009-03-04 13:41:58 +0000 (Wed, 04 Mar 2009) Log Message: ----------- version bump Modified Paths: -------------- csw/mgar/pkg/rl/trunk/Makefile csw/mgar/pkg/rl/trunk/checksums csw/mgar/pkg/rl/trunk/files/CSWrl.gspec Modified: csw/mgar/pkg/rl/trunk/Makefile =================================================================== --- csw/mgar/pkg/rl/trunk/Makefile 2009-03-04 12:05:48 UTC (rev 3578) +++ csw/mgar/pkg/rl/trunk/Makefile 2009-03-04 13:41:58 UTC (rev 3579) @@ -1,5 +1,5 @@ GARNAME = rl -GARVERSION = 0.2.6 +GARVERSION = 0.2.7 CATEGORIES = apps DESCRIPTION = A command-line tool that randomizes lines of input. @@ -18,5 +18,4 @@ # Not gonna do it TEST_SCRIPTS = - include gar/category.mk Modified: csw/mgar/pkg/rl/trunk/checksums =================================================================== --- csw/mgar/pkg/rl/trunk/checksums 2009-03-04 12:05:48 UTC (rev 3578) +++ csw/mgar/pkg/rl/trunk/checksums 2009-03-04 13:41:58 UTC (rev 3579) @@ -1,2 +1,2 @@ -5505b1ff129ac95fa2a27ee4073d81e4 download/rl-0.2.6.tar.gz -039dadb56571369413d7cf22a8854034 download/CSWrl.gspec +ed2e6c81a0524653203e0be8fa511eae download/rl-0.2.7.tar.gz +70c4ff70bf0d59f4c79262375470f82f download/CSWrl.gspec Modified: csw/mgar/pkg/rl/trunk/files/CSWrl.gspec =================================================================== --- csw/mgar/pkg/rl/trunk/files/CSWrl.gspec 2009-03-04 12:05:48 UTC (rev 3578) +++ csw/mgar/pkg/rl/trunk/files/CSWrl.gspec 2009-03-04 13:41:58 UTC (rev 3579) @@ -1,4 +1,5 @@ %var bitname rl %var pkgname CSWrl +%var hotline http://www.opencsw.org/bugtrack %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Mar 4 17:01:19 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 04 Mar 2009 16:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[3580] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 3580 http://gar.svn.sourceforge.net/gar/?rev=3580&view=rev Author: harpchad Date: 2009-03-04 16:01:19 +0000 (Wed, 04 Mar 2009) Log Message: ----------- Update to version 2.5.5 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pidgin/trunk/files/CSWpidgin.gspec Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-03-04 13:41:58 UTC (rev 3579) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-03-04 16:01:19 UTC (rev 3580) @@ -1,5 +1,5 @@ GARNAME = pidgin -GARVERSION = 2.5.4 +GARVERSION = 2.5.5 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client @@ -10,7 +10,6 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += x11.pc -DISTFILES += $(call admfiles,CSWpidgin,) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += '--with-dbus-services=/opt/csw/etc/dbus-1' Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-03-04 13:41:58 UTC (rev 3579) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-03-04 16:01:19 UTC (rev 3580) @@ -1,3 +1,2 @@ -eb28c552647ee583f3d817db690164c5 download/pidgin-2.5.4.tar.gz +08d9c0c8dd43dbcec6f67d8ba596029f download/pidgin-2.5.5.tar.gz 6dd3c13c4b6f610409fd267692dbe716 download/x11.pc -e33492bae1fd2f7773adad463f19fa0f download/CSWpidgin.gspec Deleted: csw/mgar/pkg/pidgin/trunk/files/CSWpidgin.gspec =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/CSWpidgin.gspec 2009-03-04 13:41:58 UTC (rev 3579) +++ csw/mgar/pkg/pidgin/trunk/files/CSWpidgin.gspec 2009-03-04 16:01:19 UTC (rev 3580) @@ -1,4 +0,0 @@ -%var bitname pidgin -%var pkgname CSWpidgin -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Mar 4 17:47:47 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 04 Mar 2009 16:47:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[3581] csw/mgar/pkg/curl/trunk Message-ID: Revision: 3581 http://gar.svn.sourceforge.net/gar/?rev=3581&view=rev Author: harpchad Date: 2009-03-04 16:47:44 +0000 (Wed, 04 Mar 2009) Log Message: ----------- Update to version 7.19.4 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec csw/mgar/pkg/curl/trunk/files/CSWcurldevel.gspec csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-03-04 16:01:19 UTC (rev 3580) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-03-04 16:47:44 UTC (rev 3581) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.19.3 +GARVERSION = 7.19.4 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. @@ -19,10 +19,12 @@ DISTFILES += libcurl.so.2.0.2.s DISTFILES += libcurl.so.3.0.0.i DISTFILES += libcurl.so.2.0.2.i -DISTFILES += $(call admfiles,CSWcurl,) -DISTFILES += $(call admfiles,CSWcurlrt,) -DISTFILES += $(call admfiles,CSWcurldevel,) +PACKAGES = CSWcurl CSWcurlrt CSWcurldevel +CATALOGNAME_CSWcurl = curl +CATALOGNAME_CSWcurlrt = curlrt +CATALOGNAME_CSWcurldevel = curldevel + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -38,8 +40,7 @@ REQUIRED_PKGS_CSWcurlrt = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl REQUIRED_PKGS_CSWcurldevel = CSWcurlrt -ENABLE_CHECK = 0 -TEST_TARGET = +SKIPTEST = 1 PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL) PKGFILES_CSWcurlrt = $(PKGFILES_RT) Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2009-03-04 16:01:19 UTC (rev 3580) +++ csw/mgar/pkg/curl/trunk/checksums 2009-03-04 16:47:44 UTC (rev 3581) @@ -1,8 +1,5 @@ -97e7af7f474c7fe28184d753acb539ec download/CSWcurl.gspec -cb9741fd1adaa81f640632a685424e6a download/CSWcurldevel.gspec -4596459435b4dc77f99a15e2e3ee76d6 download/CSWcurlrt.gspec -10eb8c13350c735eff20d7b4530be8cd download/curl-7.19.3.tar.bz2 -a09fcad6dfcd9636061dfab7598357be download/libcurl.so.2.0.2.i +2734167c1e5f7ce6be99b75d2d371d85 download/curl-7.19.4.tar.bz2 +b63de55fb90feba487b1fd21e751d248 download/libcurl.so.3.0.0.s b46b41659b805013740eeb76e759af4b download/libcurl.so.2.0.2.s 30e826ef67b6ce799b32154250014dd9 download/libcurl.so.3.0.0.i -b63de55fb90feba487b1fd21e751d248 download/libcurl.so.3.0.0.s +a09fcad6dfcd9636061dfab7598357be download/libcurl.so.2.0.2.i Deleted: csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec 2009-03-04 16:01:19 UTC (rev 3580) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec 2009-03-04 16:47:44 UTC (rev 3581) @@ -1,4 +0,0 @@ -%var bitname curl -%var pkgname CSWcurl -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/curl/trunk/files/CSWcurldevel.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurldevel.gspec 2009-03-04 16:01:19 UTC (rev 3580) +++ csw/mgar/pkg/curl/trunk/files/CSWcurldevel.gspec 2009-03-04 16:47:44 UTC (rev 3581) @@ -1,4 +0,0 @@ -%var bitname curldevel -%var pkgname CSWcurldevel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec 2009-03-04 16:01:19 UTC (rev 3580) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec 2009-03-04 16:47:44 UTC (rev 3581) @@ -1,4 +0,0 @@ -%var bitname curlrt -%var pkgname CSWcurlrt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Mar 4 18:09:42 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 04 Mar 2009 17:09:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3582] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 3582 http://gar.svn.sourceforge.net/gar/?rev=3582&view=rev Author: harpchad Date: 2009-03-04 17:09:42 +0000 (Wed, 04 Mar 2009) Log Message: ----------- Bug fixes Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums csw/mgar/pkg/pidgin/trunk/files/x11.pc Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-03-04 16:47:44 UTC (rev 3581) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-03-04 17:09:42 UTC (rev 3582) @@ -26,7 +26,7 @@ MSGMERGE=/opt/csw/bin/gmsgmerge SED=/opt/csw/bin/gsed EXTRA_CONFIGURE_EXPORTS = DOT XGETTEXT MSGFMT MSGMERGE SED -EXTRA_INC += /opt/csw/include/ncurses +EXTRA_INC = /opt/csw/include/ncurses #Need to include our own x11.pc file as solaris 8 doesn't have one EXTRA_PKGCONFIG_PATH = $(CURDIR)/$(WORKDIR) Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-03-04 16:47:44 UTC (rev 3581) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-03-04 17:09:42 UTC (rev 3582) @@ -1,2 +1,2 @@ 08d9c0c8dd43dbcec6f67d8ba596029f download/pidgin-2.5.5.tar.gz -6dd3c13c4b6f610409fd267692dbe716 download/x11.pc +715c7954371b53f6ca4083a011cadfe5 download/x11.pc Modified: csw/mgar/pkg/pidgin/trunk/files/x11.pc =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/x11.pc 2009-03-04 16:47:44 UTC (rev 3581) +++ csw/mgar/pkg/pidgin/trunk/files/x11.pc 2009-03-04 17:09:42 UTC (rev 3582) @@ -7,9 +7,6 @@ Name: X11 Description: X Library -Version: 0.0 -Requires: xproto kbproto inputproto -Requires.private: xau xdmcp Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API Libs: -L${libdir} -R${libdir} -lX11 Libs.private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 4 19:46:34 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 04 Mar 2009 18:46:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3583] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 3583 http://gar.svn.sourceforge.net/gar/?rev=3583&view=rev Author: bonivart Date: 2009-03-04 18:46:34 +0000 (Wed, 04 Mar 2009) Log Message: ----------- clamav: testing 0.95rc1 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2009-03-04 17:09:42 UTC (rev 3582) +++ csw/mgar/pkg/clamav/trunk/Makefile 2009-03-04 18:46:34 UTC (rev 3583) @@ -1,5 +1,11 @@ +# http://www.clamav.net/snapshot/clamav-devel-latest.tar.gz +# review deps +# - remove: gmp, tcp wrappers (?) +# - add: ncurses, unrar (?) + GARNAME = clamav -GARVERSION = 0.94.2 +GARVERSION = 0.95rc1 +WORKSRC = $(WORKDIR)/$(GARNAME)-devel-latest CATEGORIES = apps DESCRIPTION = Clam AntiVirus @@ -11,10 +17,13 @@ the package is an anti-virus engine available in a form of shared library. endef -SF_PROJ = clamav -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall) +#SF_PROJ = clamav +#MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = http://www.clamav.net/snapshot/ +#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-devel-latest.tar.gz +#DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall) +DISTFILES += $(call admfiles,CSWclamav,) DISTFILES += $(call admfiles,CSWlibclamav,) SPKG_DESC_CSWclamav = Clam AntiVirus @@ -26,7 +35,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES_CSWclamav = none cswcpsampleconf cswinitsmf +# add usergroup class +SPKG_CLASSES_CSWclamav = none cswusergroup cswautouser cswcpsampleconf cswinitsmf OPT_FLAGS_SOS = -xO2 @@ -43,11 +53,21 @@ PKGFILES_CSWlibclamav += $(includedir)/.* PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } { print }' +# fix usergroup stuff +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } \ + $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } \ + $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ + $$$$3 ~ /\/clamav-milter.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ + $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ + $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } \ + $$$$3 ~ /\/etc\/opt\/csw\/clamav\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ + { print }' SPKG_SOURCEURL = http://www.clamav.net/ -#ENABLE_CHECK=0 +TEST_TARGET = check +ENABLE_CHECK=0 include gar/category.mk Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2009-03-04 17:09:42 UTC (rev 3582) +++ csw/mgar/pkg/clamav/trunk/checksums 2009-03-04 18:46:34 UTC (rev 3583) @@ -1,5 +1,3 @@ -1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz +9ae62dd70ac3dabd775c2c9cba7cfd73 download/clamav-devel-latest.tar.gz dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec -265f727008d1645114839cdbd9399be6 download/CSWclamav.checkinstall -03e2a2aaf95b2cd8497ad6742b9fbb46 download/CSWclamav.preinstall 8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Mar 4 20:11:57 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 04 Mar 2009 19:11:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[3584] csw/mgar/gar/v2 Message-ID: Revision: 3584 http://gar.svn.sourceforge.net/gar/?rev=3584&view=rev Author: bdwalton Date: 2009-03-04 19:11:57 +0000 (Wed, 04 Mar 2009) Log Message: ----------- Enable Git repo tracking with GAR. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk csw/mgar/gar/v2/gar.mk Added Paths: ----------- csw/mgar/gar/v2/bin/gitproxy Added: csw/mgar/gar/v2/bin/gitproxy =================================================================== --- csw/mgar/gar/v2/bin/gitproxy (rev 0) +++ csw/mgar/gar/v2/bin/gitproxy 2009-03-04 19:11:57 UTC (rev 3584) @@ -0,0 +1,20 @@ +#!/bin/bash + +if [ -n "${http_proxy}" ]; then + + REMHOST=$1 + REMPORT=$2 + + set - $(echo "${http_proxy}" | sed 's/http//i' | tr -d '/' | tr ':' ' ') + PROXYHOST=$1 + PROXYPORT=$2 + + # this bit is copied from http://lkml.org/lkml/2006/2/26/207 and then + # modified to use netcat and handle proxy settings from the env. + (echo "CONNECT ${REMHOST}:${REMPORT} HTTP/1.0"; echo; cat ) | + nc ${PROXYHOST} ${PROXYPORT} | (read a; read a; cat ) + +else + echo Please set http_proxy in your environment. + exit 1 +fi Property changes on: csw/mgar/gar/v2/bin/gitproxy ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-03-04 18:46:34 UTC (rev 3583) +++ csw/mgar/gar/v2/gar.conf.mk 2009-03-04 19:11:57 UTC (rev 3584) @@ -31,6 +31,9 @@ MANIFEST_FILE ?= manifest LOGDIR ?= log +GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy +GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master + # Outbound proxies http_proxy ?= ftp_proxy ?= @@ -131,8 +134,14 @@ # These are the core packages which must be installed for GAR to function correctly -PREREQUISITE_BASE_PKGS ?= CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 +DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 +ifdef GIT_REPOS +# netcat and bash are for the gitproxy script. +DEF_BASE_PKGS += CSWgit CSWnetcat +endif +PREREQUISITE_BASE_PKGS ?= $(DEF_BASE_PKGS) + # Supported architectures returned from isalist(1) # Not all architectures are detected by all Solaris releases, especially # older releases lack precise detection. Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-03-04 18:46:34 UTC (rev 3583) +++ csw/mgar/gar/v2/gar.lib.mk 2009-03-04 19:11:57 UTC (rev 3584) @@ -17,14 +17,26 @@ # convenience variable to make the cookie. MAKECOOKIE = mkdir -p $(COOKIEDIR)/$(@D) && date >> $(COOKIEDIR)/$@ +URLSTRIP = $(subst ://,//,$(1)) + +# if you need to proxy git:// connections, set GIT_USE_PROXY. There is a +# default proxy script that works with the (squid?) proxy at the BO buildfarm. +# override GIT_PROXY_SCRIPT to something else if you need to. +GIT_MAYBEPROXY = $(if $(GIT_USE_PROXY),GIT_PROXY_COMMAND=$(GIT_PROXY_SCRIPT)) +GIT_TREEISH = $(if $(GIT_TREEISH_$(1)),$(GIT_TREEISH_$(1)),HEAD) + #################### FETCH RULES #################### -URLS = $(subst ://,//,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES)))) +URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES)))) # if the caller has defined _postinstall, etc targets for a package, add # these 'dynamic script' targets to our fetch list URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr//$(DYN)) +ifdef GIT_REPOS +URLS += $(foreach R,$(GIT_REPOS),gitrepo//$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) +endif + # Download the file if and only if it doesn't have a preexisting # checksum file. Loop through available URLs and stop when you # get one that doesn't return an error code. @@ -43,6 +55,30 @@ fi; \ fi +gitrepo//%: + @( if [ -d $(GARCHIVEDIR)/$(call GITPROJ,$*) ]; then \ + ( cd $(GARCHIVEDIR)/$(call GITPROJ,$*); \ + $(GIT_MAYBEPROXY) git --bare fetch ) && \ + gln -s $(GARCHIVEDIR)/$(call GITPROJ,$*)/ $(PARTIALDIR)/$(call GITPROJ,$*); \ + else \ + false; \ + fi ) + +# the git remote add commands are so that we can later do a fetch +# to update the code. +# we possibly proxy the git:// references depending on GIT_USE_PROXY +git-http//%: + @$git clone --bare http://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin http://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + +git//%: + @$(GIT_MAYBEPROXY) git clone --bare git://$* $(PARTIALDIR)/$(call GITPROJ,$*) + @( cd $(PARTIALDIR)/$(call GITPROJ,$*); \ + git remote add origin git://$*; \ + git config remote.origin.fetch $(if $(GIT_REFS_$(call GITPROJ,$*)),$(GIT_REFS_$(call GITPROJ,$*)),$(GIT_DEFAULT_TRACK)); ) + # create ADMSCRIPTS 'on the fly' from variables defined by the caller # This version is private and should only be called from the non-private # version directly below @@ -118,7 +154,6 @@ echo '(!!!) $* not in $(CHECKSUM_FILE) file!' 1>&2; \ false; \ fi - #################### CHECKNEW RULES #################### @@ -277,6 +312,13 @@ @gzip -d $(WORKDIR)/$* @$(MAKECOOKIE) +# extra dependency rule for git repos, that will allow the user +# to supply an alternate target at their discretion +git-extract-%: + @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" + git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + # rule to extract files with unzip zip-extract-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" @@ -345,6 +387,9 @@ extract-archive-%.gz: gz-extract-%.gz @$(MAKECOOKIE) +extract-archive-%.git: git-extract-%.git + @$(MAKECOOKIE) + # anything we don't know about, we just assume is already # uncompressed and unarchived in plain format extract-archive-%: cp-extract-% Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-03-04 18:46:34 UTC (rev 3583) +++ csw/mgar/gar/v2/gar.mk 2009-03-04 19:11:57 UTC (rev 3584) @@ -29,15 +29,18 @@ MAKEPATH = $(shell echo $(1) | perl -lne 'print join(":", split)') TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') +#meant to take a git url and return just the $proj.git part +GITPROJ = $(lastword $(subst /, ,$(1))) + PARALLELMFLAGS ?= $(MFLAGS) export PARALLELMFLAGS DISTNAME ?= $(GARNAME)-$(GARVERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) -_NOCHECKSUM += $(DYNSCRIPTS) +_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(DYNSCRIPTS) +ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) @@ -238,6 +241,8 @@ @$(foreach P,$(PATCHFILES),echo " $P";) @echo "Dynamically generated scripts: " @$(foreach D,$(DYNSCRIPTS),echo " $D";) + @echo "Git Repos tracked: " + @$(foreach R,$(GIT_REPOS),echo " $R";) # fetch - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined) # into $(DOWNLOADDIR) as necessary. @@ -289,8 +294,8 @@ garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS))) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS)))) +EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))) +EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))) # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 4 21:59:31 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 04 Mar 2009 20:59:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3585] csw/mgar/pkg Message-ID: Revision: 3585 http://gar.svn.sourceforge.net/gar/?rev=3585&view=rev Author: valholla Date: 2009-03-04 20:59:29 +0000 (Wed, 04 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/alpine/ csw/mgar/pkg/alpine/branches/ csw/mgar/pkg/alpine/tags/ csw/mgar/pkg/alpine/trunk/ csw/mgar/pkg/alpine/trunk/Makefile csw/mgar/pkg/alpine/trunk/checksums csw/mgar/pkg/alpine/trunk/files/ Property changes on: csw/mgar/pkg/alpine/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile (rev 0) +++ csw/mgar/pkg/alpine/trunk/Makefile 2009-03-04 20:59:29 UTC (rev 3585) @@ -0,0 +1,31 @@ +GARNAME = alpine +GARVERSION = 2.0 +CATEGORIES = apps + +DESCRIPTION = Alpine Messaging System +define BLURB + Alpine is a fast, easy to use email client that is suitable for both + the inexperienced email user as well as for the most demanding of power + users. Alpine is based on the Pine? Message System, which was also + developed at the University of Washington. Alpine can be learned by + exploration and the use of context-sensitive help. The user experience + is highly customizable through the use of the Alpine Setup command. +endef + +MASTER_SITES = http://www.washington.edu/alpine +SPKG_SOURCE_URL = ftp://ftp.cac.washington.edu/alpine/ +DISTFILES = $(GARNAME).tar.bz2 + +PACKAGES = CSWalpine +CATALOGNAME_CSWgd = alpine +SPKG_DESC_CSWgd = $(DESCRIPTION) + +# We define upstream file regex so we can be notifed of new +# upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Mar 4 22:54:05 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 04 Mar 2009 21:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3586] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 3586 http://gar.svn.sourceforge.net/gar/?rev=3586&view=rev Author: skayser Date: 2009-03-04 21:54:05 +0000 (Wed, 04 Mar 2009) Log Message: ----------- gar: fixed syntax error Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-03-04 20:59:29 UTC (rev 3585) +++ csw/mgar/gar/v2/gar.mk 2009-03-04 21:54:05 UTC (rev 3586) @@ -421,7 +421,7 @@ # strip - Strip executables ifneq ($(GARFLAVOR),DBG) - POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) +POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) endif strip: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Mar 4 23:52:36 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 04 Mar 2009 22:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[3587] csw/mgar/pkg/watch/trunk Message-ID: Revision: 3587 http://gar.svn.sourceforge.net/gar/?rev=3587&view=rev Author: skayser Date: 2009-03-04 22:52:35 +0000 (Wed, 04 Mar 2009) Log Message: ----------- watch: fixed asprintf() Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/checksums csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff csw/mgar/pkg/watch/trunk/files/snprintf.c csw/mgar/pkg/watch/trunk/files/snprintf.h Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2009-03-04 21:54:05 UTC (rev 3586) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-03-04 22:52:35 UTC (rev 3587) @@ -1,13 +1,14 @@ -# Todo -# * asprintf() from portable snprintf.c isn't working yet -# Header line on watch output always reads "Every fs: " -# +# Todo: +# * watch called for programs with longer than terminal output +# (for example "find ." or "ls -lR" or "last" on build8x) causes +# broken pipe on second program invocation GARNAME = watch GARVERSION = 3.2.7 CATEGORIES = utils DESCRIPTION = Watch a program output change over time -define BLURB +define Blurb + "watch" from the procps package. endef # Usually we would use $(SF_MIRROR), but the procps folks didn't upload @@ -35,14 +36,17 @@ # # 1) Remove unnecessary build instructions that would cause errors otherwise # 2) Bring in GNU getopt for getopt_long() -# 3) Bring in asprintf() +# 3) Bring in snprintf.c for a portable version of asprintf() # -# GNU getopt from http://cherokee-project.com -# asprintf from http://www.ijs.si/software/snprintf/ +# GNU getopt taken from +# http://svn.cherokee-project.com/browser/cherokee/trunk/cherokee/getopt +# snprintf.c taken from http://www.jhweiss.de/software/snprintf.html # -# Tell snprintf.c that we have snprintf and need asprintf() -CFLAGS := $(CFLAGS) -DHAVE_SNPRINTF -DNEED_ASPRINTF +# Don't tell snprintf.c that you have v?snprintf, output will be garbled +CFLAGS := $(CFLAGS) -DHAVE_STDARG_H -DHAVE_STDLIB_H -DHAVE_STDDEF +CFLAGS := $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_LOCALE_H -DHAVE_LOCALECONV +CFLAGS := $(CFLAGS) -DHAVE_LOCALECONV -DHAVE_UINTMAX_T -DHAVE_VA_COPY pre-build-modulated: @rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk @@ -51,13 +55,14 @@ @cp $(FILEDIR)/gettext.h* $(WORKSRC) $(MAKECOOKIE) +build-custom: BUILD_ARGS:=ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" build-custom: - @(cd $(WORKSRC); \ - gmake ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" snprintf.o; \ - gmake ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" getopt.o; \ - gmake ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" getopt1.o; \ - gmake ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ - ALL_LDFLAGS="$(LDFLAGS)" watch) + @gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o + @gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o + @gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o + @gmake -C $(WORKSRC) \ + ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ + ALL_LDFLAGS="$(LDFLAGS)" watch $(MAKECOOKIE) install-custom: Modified: csw/mgar/pkg/watch/trunk/checksums =================================================================== --- csw/mgar/pkg/watch/trunk/checksums 2009-03-04 21:54:05 UTC (rev 3586) +++ csw/mgar/pkg/watch/trunk/checksums 2009-03-04 22:52:35 UTC (rev 3587) @@ -1,2 +1,2 @@ f490bca772b16472962c7b9f23b1e97d download/procps-3.2.7.tar.gz -223ba15056890d0d15431276d027d480 download/patch-extralibs.diff +05f5e9e304c4300b056ffd61eafebffa download/patch-extralibs.diff Modified: csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff =================================================================== --- csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff 2009-03-04 21:54:05 UTC (rev 3586) +++ csw/mgar/pkg/watch/trunk/files/patch-extralibs.diff 2009-03-04 22:52:35 UTC (rev 3587) @@ -14,7 +14,7 @@ #include #include #include -+#include ++#include "snprintf.h" #include "proc/procps.h" #ifdef FORCE_8BIT Modified: csw/mgar/pkg/watch/trunk/files/snprintf.c =================================================================== --- csw/mgar/pkg/watch/trunk/files/snprintf.c 2009-03-04 21:54:05 UTC (rev 3586) +++ csw/mgar/pkg/watch/trunk/files/snprintf.c 2009-03-04 22:52:35 UTC (rev 3587) @@ -1,1025 +1,2099 @@ +/* $Id: snprintf.c,v 1.9 2008/01/20 14:02:00 holger Exp $ */ + /* - * snprintf.c - a portable implementation of snprintf + * Copyright (c) 1995 Patrick Powell. * - * AUTHOR - * Mark Martinec , April 1999. + * This code is based on code written by Patrick Powell . + * It may be used for any purpose as long as this notice remains intact on all + * source code distributions. + */ + +/* + * Copyright (c) 2008 Holger Weiss. * - * Copyright 1999, Mark Martinec. All rights reserved. + * This version of the code is maintained by Holger Weiss . + * My changes to the code may freely be used, modified and/or redistributed for + * any purpose. It would be nice if additions and fixes to this file (including + * trivial code cleanups) would be sent back in order to let me include them in + * the version available at . + * However, this is not a requirement for using or redistributing (possibly + * modified) versions of this file, nor is leaving this notice intact mandatory. + */ + +/* + * History * - * TERMS AND CONDITIONS - * This program is free software; you can redistribute it and/or modify - * it under the terms of the "Frontier Artistic License" which comes - * with this Kit. + * 2008-01-20 Holger Weiss for C99-snprintf 1.1: * - * 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 Frontier Artistic License for more details. + * Fixed the detection of infinite floating point values on IRIX (and + * possibly other systems) and applied another few minor cleanups. * - * You should have received a copy of the Frontier Artistic License - * with this Kit in the file named LICENSE.txt . - * If not, I'll be glad to provide one. + * 2008-01-06 Holger Weiss for C99-snprintf 1.0: * - * FEATURES - * - careful adherence to specs regarding flags, field width and precision; - * - good performance for large string handling (large format, large - * argument or large paddings). Performance is similar to system's sprintf - * and in several cases significantly better (make sure you compile with - * optimizations turned on, tell the compiler the code is strict ANSI - * if necessary to give it more freedom for optimizations); - * - return value semantics per ISO/IEC 9899:1999 ("ISO C99"); - * - written in standard ISO/ANSI C - requires an ANSI C compiler. + * Added a lot of new features, fixed many bugs, and incorporated various + * improvements done by Andrew Tridgell , Russ Allbery + * , Hrvoje Niksic , Damien Miller + * , and others for the Samba, INN, Wget, and OpenSSH + * projects. The additions include: support the "e", "E", "g", "G", and + * "F" conversion specifiers (and use conversion style "f" or "F" for the + * still unsupported "a" and "A" specifiers); support the "hh", "ll", "j", + * "t", and "z" length modifiers; support the "#" flag and the (non-C99) + * "'" flag; use localeconv(3) (if available) to get both the current + * locale's decimal point character and the separator between groups of + * digits; fix the handling of various corner cases of field width and + * precision specifications; fix various floating point conversion bugs; + * handle infinite and NaN floating point values; don't attempt to write to + * the output buffer (which may be NULL) if a size of zero was specified; + * check for integer overflow of the field width, precision, and return + * values and during the floating point conversion; use the OUTCHAR() macro + * instead of a function for better performance; provide asprintf(3) and + * vasprintf(3) functions; add new test cases. The replacement functions + * have been renamed to use an "rpl_" prefix, the function calls in the + * main project (and in this file) must be redefined accordingly for each + * replacement function which is needed (by using Autoconf or other means). + * Various other minor improvements have been applied and the coding style + * was cleaned up for consistency. * - * SUPPORTED CONVERSION SPECIFIERS AND DATA TYPES + * 2007-07-23 Holger Weiss for Mutt 1.5.13: * - * This snprintf only supports the following conversion specifiers: - * s, c, d, u, o, x, X, p (and synonyms: i, D, U, O - see below) - * with flags: '-', '+', ' ', '0' and '#'. - * An asterisk is supported for field width as well as precision. + * C99 compliant snprintf(3) and vsnprintf(3) functions return the number + * of characters that would have been written to a sufficiently sized + * buffer (excluding the '\0'). The original code simply returned the + * length of the resulting output string, so that's been fixed. * - * Length modifiers 'h' (short int), 'l' (long int), - * and 'll' (long long int) are supported. - * NOTE: - * If macro SNPRINTF_LONGLONG_SUPPORT is not defined (default) the - * length modifier 'll' is recognized but treated the same as 'l', - * which may cause argument value truncation! Defining - * SNPRINTF_LONGLONG_SUPPORT requires that your system's sprintf also - * handles length modifier 'll'. long long int is a language extension - * which may not be portable. + * 1998-03-05 Michael Elkins for Mutt 0.90.8: * - * Conversion of numeric data (conversion specifiers d, u, o, x, X, p) - * with length modifiers (none or h, l, ll) is left to the system routine - * sprintf, but all handling of flags, field width and precision as well as - * c and s conversions is done very carefully by this portable routine. - * If a string precision (truncation) is specified (e.g. %.8s) it is - * guaranteed the string beyond the specified precision will not be referenced. + * The original code assumed that both snprintf(3) and vsnprintf(3) were + * missing. Some systems only have snprintf(3) but not vsnprintf(3), so + * the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF. * - * Length modifiers h, l and ll are ignored for c and s conversions (data - * types wint_t and wchar_t are not supported). + * 1998-01-27 Thomas Roessler for Mutt 0.89i: * - * The following common synonyms for conversion characters are supported: - * - i is a synonym for d - * - D is a synonym for ld, explicit length modifiers are ignored - * - U is a synonym for lu, explicit length modifiers are ignored - * - O is a synonym for lo, explicit length modifiers are ignored - * The D, O and U conversion characters are nonstandard, they are supported - * for backward compatibility only, and should not be used for new code. + * The PGP code was using unsigned hexadecimal formats. Unfortunately, + * unsigned formats simply didn't work. * - * The following is specifically NOT supported: - * - flag ' (thousands' grouping character) is recognized but ignored - * - numeric conversion specifiers: f, e, E, g, G and synonym F, - * as well as the new a and A conversion specifiers - * - length modifier 'L' (long double) and 'q' (quad - use 'll' instead) - * - wide character/string conversions: lc, ls, and nonstandard - * synonyms C and S - * - writeback of converted string length: conversion character n - * - the n$ specification for direct reference to n-th argument - * - locales + * 1997-10-22 Brandon Long for Mutt 0.87.1: * - * It is permitted for str_m to be zero, and it is permitted to specify NULL - * pointer for resulting string argument if str_m is zero (as per ISO C99). + * Ok, added some minimal floating point support, which means this probably + * requires libm on most operating systems. Don't yet support the exponent + * (e,E) and sigfig (g,G). Also, fmtint() was pretty badly broken, it just + * wasn't being exercised in ways which showed it, so that's been fixed. + * Also, formatted the code to Mutt conventions, and removed dead code left + * over from the original. Also, there is now a builtin-test, run with: + * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm && ./snprintf * - * The return value is the number of characters which would be generated - * for the given input, excluding the trailing null. If this value - * is greater or equal to str_m, not all characters from the result - * have been stored in str, output bytes beyond the (str_m-1) -th character - * are discarded. If str_m is greater than zero it is guaranteed - * the resulting string will be null-terminated. + * 2996-09-15 Brandon Long for Mutt 0.43: * - * NOTE that this matches the ISO C99, OpenBSD, and GNU C library 2.1, - * but is different from some older and vendor implementations, - * and is also different from XPG, XSH5, SUSv2 specifications. - * For historical discussion on changes in the semantics and standards - * of snprintf see printf(3) man page in the Linux programmers manual. + * This was ugly. It is still ugly. I opted out of floating point + * numbers, but the formatter understands just about everything from the + * normal C string format, at least as far as I can tell from the Solaris + * 2.5 printf(3S) man page. + */ + +/* + * ToDo * - * Routines asprintf and vasprintf return a pointer (in the ptr argument) - * to a buffer sufficiently large to hold the resulting string. This pointer - * should be passed to free(3) to release the allocated storage when it is - * no longer needed. If sufficient space cannot be allocated, these functions - * will return -1 and set ptr to be a NULL pointer. These two routines are a - * GNU C library extensions (glibc). + * - Add wide character support. + * - Add support for "%a" and "%A" conversions. + * - Create test routines which predefine the expected results. Our test cases + * usually expose bugs in system implementations rather than in ours :-) + */ + +/* + * Usage * - * Routines asnprintf and vasnprintf are similar to asprintf and vasprintf, - * yet, like snprintf and vsnprintf counterparts, will write at most str_m-1 - * characters into the allocated output string, the last character in the - * allocated buffer then gets the terminating null. If the formatted string - * length (the return value) is greater than or equal to the str_m argument, - * the resulting string was truncated and some of the formatted characters - * were discarded. These routines present a handy way to limit the amount - * of allocated memory to some sane value. + * 1) The following preprocessor macros should be defined to 1 if the feature or + * file in question is available on the target system (by using Autoconf or + * other means), though basic functionality should be available as long as + * HAVE_STDARG_H and HAVE_STDLIB_H are defined correctly: * - * AVAILABILITY - * http://www.ijs.si/software/snprintf/ + * HAVE_VSNPRINTF + * HAVE_SNPRINTF + * HAVE_VASPRINTF + * HAVE_ASPRINTF + * HAVE_STDARG_H + * HAVE_STDDEF_H + * HAVE_STDINT_H + * HAVE_STDLIB_H + * HAVE_INTTYPES_H + * HAVE_LOCALE_H + * HAVE_LOCALECONV + * HAVE_LCONV_DECIMAL_POINT + * HAVE_LCONV_THOUSANDS_SEP + * HAVE_LONG_DOUBLE + * HAVE_LONG_LONG_INT + * HAVE_UNSIGNED_LONG_LONG_INT + * HAVE_INTMAX_T + * HAVE_UINTMAX_T + * HAVE_UINTPTR_T + * HAVE_PTRDIFF_T + * HAVE_VA_COPY + * HAVE___VA_COPY * - * REVISION HISTORY - * 1999-04 V0.9 Mark Martinec - * - initial version, some modifications after comparing printf - * man pages for Digital Unix 4.0, Solaris 2.6 and HPUX 10, - * and checking how Perl handles sprintf (differently!); - * 1999-04-09 V1.0 Mark Martinec - * - added main test program, fixed remaining inconsistencies, - * added optional (long long int) support; - * 1999-04-12 V1.1 Mark Martinec - * - support the 'p' conversion (pointer to void); - * - if a string precision is specified - * make sure the string beyond the specified precision - * will not be referenced (e.g. by strlen); - * 1999-04-13 V1.2 Mark Martinec - * - support synonyms %D=%ld, %U=%lu, %O=%lo; - * - speed up the case of long format string with few conversions; - * 1999-06-30 V1.3 Mark Martinec - * - fixed runaway loop (eventually crashing when str_l wraps - * beyond 2^31) while copying format string without - * conversion specifiers to a buffer that is too short - * (thanks to Edwin Young for - * spotting the problem); - * - added macros PORTABLE_SNPRINTF_VERSION_(MAJOR|MINOR) - * to snprintf.h - * 2000-02-14 V2.0 (never released) Mark Martinec - * - relaxed license terms: The Artistic License now applies. - * You may still apply the GNU GENERAL PUBLIC LICENSE - * as was distributed with previous versions, if you prefer; - * - changed REVISION HISTORY dates to use ISO 8601 date format; - * - added vsnprintf (patch also independently proposed by - * Caolan McNamara 2000-05-04, and Keith M Willenson 2000-06-01) - * 2000-06-27 V2.1 Mark Martinec - * - removed POSIX check for str_m<1; value 0 for str_m is - * allowed by ISO C99 (and GNU C library 2.1) - (pointed out - * on 2000-05-04 by Caolan McNamara, caolan@ csn dot ul dot ie). - * Besides relaxed license this change in standards adherence - * is the main reason to bump up the major version number; - * - added nonstandard routines asnprintf, vasnprintf, asprintf, - * vasprintf that dynamically allocate storage for the - * resulting string; these routines are not compiled by default, - * see comments where NEED_V?ASN?PRINTF macros are defined; - * - autoconf contributed by Caolan McNamara - * 2000-10-06 V2.2 Mark Martinec - * - BUG FIX: the %c conversion used a temporary variable - * that was no longer in scope when referenced, - * possibly causing incorrect resulting character; - * - BUG FIX: make precision and minimal field width unsigned - * to handle huge values (2^31 <= n < 2^32) correctly; - * also be more careful in the use of signed/unsigned/size_t - * internal variables - probably more careful than many - * vendor implementations, but there may still be a case - * where huge values of str_m, precision or minimal field - * could cause incorrect behaviour; - * - use separate variables for signed/unsigned arguments, - * and for short/int, long, and long long argument lengths - * to avoid possible incompatibilities on certain - * computer architectures. Also use separate variable - * arg_sign to hold sign of a numeric argument, - * to make code more transparent; - * - some fiddling with zero padding and "0x" to make it - * Linux compatible; - * - systematically use macros fast_memcpy and fast_memset - * instead of case-by-case hand optimization; determine some - * breakeven string lengths for different architectures; - * - terminology change: 'format' -> 'conversion specifier', - * 'C9x' -> 'ISO/IEC 9899:1999 ("ISO C99")', - * 'alternative form' -> 'alternate form', - * 'data type modifier' -> 'length modifier'; - * - several comments rephrased and new ones added; - * - make compiler not complain about 'credits' defined but - * not used; + * 2) The calls to the functions which should be replaced must be redefined + * throughout the project files (by using Autoconf or other means): + * + * #define vsnprintf rpl_vsnprintf + * #define snprintf rpl_snprintf + * #define vasprintf rpl_vasprintf + * #define asprintf rpl_asprintf + * + * 3) The required replacement functions should be declared in some header file + * included throughout the project files: + * + * #if HAVE_CONFIG_H + * #include + * #endif + * #if HAVE_STDARG_H + * #include + * #if !HAVE_VSNPRINTF + * int rpl_vsnprintf(char *, size_t, const char *, va_list); + * #endif + * #if !HAVE_SNPRINTF + * int rpl_snprintf(char *, size_t, const char *, ...); + * #endif + * #if !HAVE_VASPRINTF + * int rpl_vasprintf(char **, const char *, va_list); + * #endif + * #if !HAVE_ASPRINTF + * int rpl_asprintf(char **, const char *, ...); + * #endif + * #endif + * + * Autoconf macros for handling step 1 and step 2 are available at + * . */ +#if HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ -/* Define HAVE_SNPRINTF if your system already has snprintf and vsnprintf. - * - * If HAVE_SNPRINTF is defined this module will not produce code for - * snprintf and vsnprintf, unless PREFER_PORTABLE_SNPRINTF is defined as well, - * causing this portable version of snprintf to be called portable_snprintf - * (and portable_vsnprintf). - */ -/* #define HAVE_SNPRINTF */ +#if TEST_SNPRINTF +#include /* For pow(3), NAN, and INFINITY. */ +#include /* For strcmp(3). */ +#if defined(__NetBSD__) || \ + defined(__FreeBSD__) || \ + defined(__OpenBSD__) || \ + defined(__NeXT__) || \ + defined(__bsd__) +#define OS_BSD 1 +#elif defined(sgi) || defined(__sgi) +#ifndef __c99 +#define __c99 /* Force C99 mode to get included on IRIX 6.5.30. */ +#endif /* !defined(__c99) */ +#define OS_IRIX 1 +#define OS_SYSV 1 +#elif defined(__svr4__) +#define OS_SYSV 1 +#elif defined(__linux__) +#define OS_LINUX 1 +#endif /* defined(__NetBSD__) || defined(__FreeBSD__) || [...] */ +#if HAVE_CONFIG_H /* Undefine definitions possibly done in config.h. */ +#ifdef HAVE_SNPRINTF +#undef HAVE_SNPRINTF +#endif /* defined(HAVE_SNPRINTF) */ +#ifdef HAVE_VSNPRINTF +#undef HAVE_VSNPRINTF +#endif /* defined(HAVE_VSNPRINTF) */ +#ifdef HAVE_ASPRINTF +#undef HAVE_ASPRINTF +#endif /* defined(HAVE_ASPRINTF) */ +#ifdef HAVE_VASPRINTF +#undef HAVE_VASPRINTF +#endif /* defined(HAVE_VASPRINTF) */ +#ifdef snprintf +#undef snprintf +#endif /* defined(snprintf) */ +#ifdef vsnprintf +#undef vsnprintf +#endif /* defined(vsnprintf) */ +#ifdef asprintf +#undef asprintf +#endif /* defined(asprintf) */ +#ifdef vasprintf +#undef vasprintf +#endif /* defined(vasprintf) */ +#else /* By default, we assume a modern system for testing. */ +#ifndef HAVE_STDARG_H +#define HAVE_STDARG_H 1 +#endif /* HAVE_STDARG_H */ +#ifndef HAVE_STDDEF_H +#define HAVE_STDDEF_H 1 +#endif /* HAVE_STDDEF_H */ +#ifndef HAVE_STDINT_H +#define HAVE_STDINT_H 1 +#endif /* HAVE_STDINT_H */ +#ifndef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 +#endif /* HAVE_STDLIB_H */ +#ifndef HAVE_INTTYPES_H +#define HAVE_INTTYPES_H 1 +#endif /* HAVE_INTTYPES_H */ +#ifndef HAVE_LOCALE_H +#define HAVE_LOCALE_H 1 +#endif /* HAVE_LOCALE_H */ +#ifndef HAVE_LOCALECONV +#define HAVE_LOCALECONV 1 +#endif /* !defined(HAVE_LOCALECONV) */ +#ifndef HAVE_LCONV_DECIMAL_POINT +#define HAVE_LCONV_DECIMAL_POINT 1 +#endif /* HAVE_LCONV_DECIMAL_POINT */ +#ifndef HAVE_LCONV_THOUSANDS_SEP +#define HAVE_LCONV_THOUSANDS_SEP 1 +#endif /* HAVE_LCONV_THOUSANDS_SEP */ +#ifndef HAVE_LONG_DOUBLE +#define HAVE_LONG_DOUBLE 1 +#endif /* !defined(HAVE_LONG_DOUBLE) */ +#ifndef HAVE_LONG_LONG_INT +#define HAVE_LONG_LONG_INT 1 +#endif /* !defined(HAVE_LONG_LONG_INT) */ +#ifndef HAVE_UNSIGNED_LONG_LONG_INT +#define HAVE_UNSIGNED_LONG_LONG_INT 1 +#endif /* !defined(HAVE_UNSIGNED_LONG_LONG_INT) */ +#ifndef HAVE_INTMAX_T +#define HAVE_INTMAX_T 1 +#endif /* !defined(HAVE_INTMAX_T) */ +#ifndef HAVE_UINTMAX_T +#define HAVE_UINTMAX_T 1 +#endif /* !defined(HAVE_UINTMAX_T) */ +#ifndef HAVE_UINTPTR_T +#define HAVE_UINTPTR_T 1 +#endif /* !defined(HAVE_UINTPTR_T) */ +#ifndef HAVE_PTRDIFF_T +#define HAVE_PTRDIFF_T 1 +#endif /* !defined(HAVE_PTRDIFF_T) */ +#ifndef HAVE_VA_COPY +#define HAVE_VA_COPY 1 +#endif /* !defined(HAVE_VA_COPY) */ +#ifndef HAVE___VA_COPY +#define HAVE___VA_COPY 1 +#endif /* !defined(HAVE___VA_COPY) */ +#endif /* HAVE_CONFIG_H */ +#define snprintf rpl_snprintf +#define vsnprintf rpl_vsnprintf +#define asprintf rpl_asprintf +#define vasprintf rpl_vasprintf +#endif /* TEST_SNPRINTF */ -/* Define PREFER_PORTABLE_SNPRINTF if your system does have snprintf and - * vsnprintf but you would prefer to use the portable routine(s) instead. - * In this case the portable routine is declared as portable_snprintf - * (and portable_vsnprintf) and a macro 'snprintf' (and 'vsnprintf') - * is defined to expand to 'portable_v?snprintf' - see file snprintf.h . - * Defining this macro is only useful if HAVE_SNPRINTF is also defined, - * but does does no harm if defined nevertheless. - */ -/* #define PREFER_PORTABLE_SNPRINTF */ +#if !HAVE_SNPRINTF || !HAVE_VSNPRINTF || !HAVE_ASPRINTF || !HAVE_VASPRINTF +#include /* For NULL, size_t, vsnprintf(3), and vasprintf(3). */ +#ifdef VA_START +#undef VA_START +#endif /* defined(VA_START) */ +#ifdef VA_SHIFT +#undef VA_SHIFT +#endif /* defined(VA_SHIFT) */ +#if HAVE_STDARG_H +#include +#define VA_START(ap, last) va_start(ap, last) +#define VA_SHIFT(ap, value, type) /* No-op for ANSI C. */ +#else /* Assume is available. */ +#include +#define VA_START(ap, last) va_start(ap) /* "last" is ignored. */ +#define VA_SHIFT(ap, value, type) value = va_arg(ap, type) +#endif /* HAVE_STDARG_H */ -/* Define SNPRINTF_LONGLONG_SUPPORT if you want to support - * data type (long long int) and length modifier 'll' (e.g. %lld). - * If undefined, 'll' is recognized but treated as a single 'l'. - * - * If the system's sprintf does not handle 'll' - * the SNPRINTF_LONGLONG_SUPPORT must not be defined! - * - * This is off by default as (long long int) is a language extension. - */ -/* #define SNPRINTF_LONGLONG_SUPPORT */ +#if !HAVE_VASPRINTF +#define vasprintf rpl_vasprintf +#if HAVE_STDLIB_H +#include /* For malloc(3). */ +#endif /* HAVE_STDLIB_H */ +#ifdef VA_COPY +#undef VA_COPY +#endif /* defined(VA_COPY) */ +#ifdef VA_END_COPY +#undef VA_END_COPY +#endif /* defined(VA_END_COPY) */ +#if HAVE_VA_COPY +#define VA_COPY(dest, src) va_copy(dest, src) +#define VA_END_COPY(ap) va_end(ap) +#elif HAVE___VA_COPY +#define VA_COPY(dest, src) __va_copy(dest, src) +#define VA_END_COPY(ap) va_end(ap) +#else +#define VA_COPY(dest, src) (void)mymemcpy(&dest, &src, sizeof(va_list)) +#define VA_END_COPY(ap) /* No-op. */ +#define NEED_MYMEMCPY 1 +static void *mymemcpy(void *, void *, size_t); +#endif /* HAVE_VA_COPY */ +#endif /* !HAVE_VASPRINTF */ -/* Define NEED_SNPRINTF_ONLY if you only need snprintf, and not vsnprintf. - * If NEED_SNPRINTF_ONLY is defined, the snprintf will be defined directly, - * otherwise both snprintf and vsnprintf routines will be defined - * and snprintf will be a simple wrapper around vsnprintf, at the expense - * of an extra procedure call. +#if !HAVE_VSNPRINTF +#define vsnprintf rpl_vsnprintf +#include /* For ERANGE and errno. */ +#include /* For *_MAX. */ +#if HAVE_INTTYPES_H +#include /* For intmax_t (if not defined in ). */ +#endif /* HAVE_INTTYPES_H */ +#if HAVE_LOCALE_H +#include /* For localeconv(3). */ +#endif /* HAVE_LOCALE_H */ +#if HAVE_STDDEF_H +#include /* For ptrdiff_t. */ +#endif /* HAVE_STDDEF_H */ +#if HAVE_STDINT_H +#include /* For intmax_t. */ +#endif /* HAVE_STDINT_H */ + +/* Support for unsigned long long int. We may also need ULLONG_MAX. */ +#ifndef ULONG_MAX /* We may need ULONG_MAX as a fallback. */ +#ifdef UINT_MAX +#define ULONG_MAX UINT_MAX +#else +#define ULONG_MAX INT_MAX +#endif /* defined(UINT_MAX) */ +#endif /* !defined(ULONG_MAX) */ +#ifdef ULLONG +#undef ULLONG +#endif /* defined(ULLONG) */ +#if HAVE_UNSIGNED_LONG_LONG_INT +#define ULLONG unsigned long long int +#ifndef ULLONG_MAX +#define ULLONG_MAX ULONG_MAX +#endif /* !defined(ULLONG_MAX) */ +#else +#define ULLONG unsigned long int +#ifdef ULLONG_MAX +#undef ULLONG_MAX +#endif /* defined(ULLONG_MAX) */ +#define ULLONG_MAX ULONG_MAX +#endif /* HAVE_LONG_LONG_INT */ + +/* Support for uintmax_t. We also need UINTMAX_MAX. */ +#ifdef UINTMAX_T +#undef UINTMAX_T +#endif /* defined(UINTMAX_T) */ +#if HAVE_UINTMAX_T || defined(uintmax_t) +#define UINTMAX_T uintmax_t +#ifndef UINTMAX_MAX +#define UINTMAX_MAX ULLONG_MAX +#endif /* !defined(UINTMAX_MAX) */ +#else +#define UINTMAX_T ULLONG +#ifdef UINTMAX_MAX +#undef UINTMAX_MAX +#endif /* defined(UINTMAX_MAX) */ +#define UINTMAX_MAX ULLONG_MAX +#endif /* HAVE_UINTMAX_T || defined(uintmax_t) */ + +/* Support for long double. */ +#ifndef LDOUBLE +#if HAVE_LONG_DOUBLE +#define LDOUBLE long double +#else +#define LDOUBLE double +#endif /* HAVE_LONG_DOUBLE */ +#endif /* !defined(LDOUBLE) */ + +/* Support for long long int. */ +#ifndef LLONG +#if HAVE_LONG_LONG_INT +#define LLONG long long int +#else +#define LLONG long int +#endif /* HAVE_LONG_LONG_INT */ +#endif /* !defined(LLONG) */ + +/* Support for intmax_t. */ +#ifndef INTMAX_T +#if HAVE_INTMAX_T || defined(intmax_t) +#define INTMAX_T intmax_t +#else +#define INTMAX_T LLONG +#endif /* HAVE_INTMAX_T || defined(intmax_t) */ +#endif /* !defined(INTMAX_T) */ + +/* Support for uintptr_t. */ +#ifndef UINTPTR_T +#if HAVE_UINTPTR_T || defined(uintptr_t) +#define UINTPTR_T uintptr_t +#else +#define UINTPTR_T unsigned long int +#endif /* HAVE_UINTPTR_T || defined(uintptr_t) */ +#endif /* !defined(UINTPTR_T) */ + +/* Support for ptrdiff_t. */ +#ifndef PTRDIFF_T +#if HAVE_PTRDIFF_T || defined(ptrdiff_t) +#define PTRDIFF_T ptrdiff_t +#else +#define PTRDIFF_T long int +#endif /* HAVE_PTRDIFF_T || defined(ptrdiff_t) */ +#endif /* !defined(PTRDIFF_T) */ + +/* + * We need an unsigned integer type corresponding to ptrdiff_t (cf. C99: + * 7.19.6.1, 7). However, we'll simply use PTRDIFF_T and convert it to an + * unsigned type if necessary. This should work just fine in practice. */ -/* #define NEED_SNPRINTF_ONLY */ +#ifndef UPTRDIFF_T +#define UPTRDIFF_T PTRDIFF_T +#endif /* !defined(UPTRDIFF_T) */ -/* Define NEED_V?ASN?PRINTF macros if you need library extension - * routines asprintf, vasprintf, asnprintf, vasnprintf respectively, - * and your system library does not provide them. They are all small - * wrapper routines around portable_vsnprintf. Defining any of the four - * NEED_V?ASN?PRINTF macros automatically turns off NEED_SNPRINTF_ONLY - * and turns on PREFER_PORTABLE_SNPRINTF. - * - * Watch for name conflicts with the system library if these routines - * are already present there. - * - * NOTE: vasprintf and vasnprintf routines need va_copy() from stdarg.h, as - * specified by C99, to be able to traverse the same list of arguments twice. - * I don't know of any other standard and portable way of achieving the same. - * With some versions of gcc you may use __va_copy(). You might even get away - * with "ap2 = ap", in this case you must not call va_end(ap2) ! - * #define va_copy(ap2,ap) ap2 = ap +/* + * We need a signed integer type corresponding to size_t (cf. C99: 7.19.6.1, 7). + * However, we'll simply use size_t and convert it to a signed type if + * necessary. This should work just fine in practice. */ -/* #define NEED_ASPRINTF */ -/* #define NEED_ASNPRINTF */ -/* #define NEED_VASPRINTF */ -/* #define NEED_VASNPRINTF */ +#ifndef SSIZE_T +#define SSIZE_T size_t +#endif /* !defined(SSIZE_T) */ +/* Either ERANGE or E2BIG should be available everywhere. */ +#ifndef ERANGE +#define ERANGE E2BIG +#endif /* !defined(ERANGE) */ +#ifndef EOVERFLOW +#define EOVERFLOW ERANGE +#endif /* !defined(EOVERFLOW) */ -/* Define the following macros if desired: - * SOLARIS_COMPATIBLE, SOLARIS_BUG_COMPATIBLE, - * HPUX_COMPATIBLE, HPUX_BUG_COMPATIBLE, LINUX_COMPATIBLE, - * DIGITAL_UNIX_COMPATIBLE, DIGITAL_UNIX_BUG_COMPATIBLE, - * PERL_COMPATIBLE, PERL_BUG_COMPATIBLE, - * - * - For portable applications it is best not to rely on peculiarities - * of a given implementation so it may be best not to define any - * of the macros that select compatibility and to avoid features - * that vary among the systems. - * - * - Selecting compatibility with more than one operating system - * is not strictly forbidden but is not recommended. - * - * - 'x'_BUG_COMPATIBLE implies 'x'_COMPATIBLE . - * - * - 'x'_COMPATIBLE refers to (and enables) a behaviour that is - * documented in a sprintf man page on a given operating system - * and actually adhered to by the system's sprintf (but not on - * most other operating systems). It may also refer to and enable - * a behaviour that is declared 'undefined' or 'implementation specific' - * in the man page but a given implementation behaves predictably - * in a certain way. - * - * - 'x'_BUG_COMPATIBLE refers to (and enables) a behaviour of system's sprintf - * that contradicts the sprintf man page on the same operating system. - * - * - I do not claim that the 'x'_COMPATIBLE and 'x'_BUG_COMPATIBLE - * conditionals take into account all idiosyncrasies of a particular - * implementation, there may be other incompatibilities. +/* + * Buffer size to hold the octal string representation of UINT128_MAX without + * nul-termination ("3777777777777777777777777777777777777777777"). */ +#ifdef MAX_CONVERT_LENGTH +#undef MAX_CONVERT_LENGTH +#endif /* defined(MAX_CONVERT_LENGTH) */ +#define MAX_CONVERT_LENGTH 43 +/* Format read states. */ +#define PRINT_S_DEFAULT 0 +#define PRINT_S_FLAGS 1 +#define PRINT_S_WIDTH 2 +#define PRINT_S_DOT 3 +#define PRINT_S_PRECISION 4 +#define PRINT_S_MOD 5 +#define PRINT_S_CONV 6 - -/* ============================================= */ -/* NO USER SERVICABLE PARTS FOLLOWING THIS POINT */ -/* ============================================= */ +/* Format flags. */ +#define PRINT_F_MINUS (1 << 0) +#define PRINT_F_PLUS (1 << 1) +#define PRINT_F_SPACE (1 << 2) +#define PRINT_F_NUM (1 << 3) +#define PRINT_F_ZERO (1 << 4) +#define PRINT_F_QUOTE (1 << 5) +#define PRINT_F_UP (1 << 6) +#define PRINT_F_UNSIGNED (1 << 7) +#define PRINT_F_TYPE_G (1 << 8) +#define PRINT_F_TYPE_E (1 << 9) -#define PORTABLE_SNPRINTF_VERSION_MAJOR 2 -#define PORTABLE_SNPRINTF_VERSION_MINOR 2 +/* Conversion flags. */ +#define PRINT_C_CHAR 1 +#define PRINT_C_SHORT 2 +#define PRINT_C_LONG 3 +#define PRINT_C_LLONG 4 +#define PRINT_C_LDOUBLE 5 +#define PRINT_C_SIZE 6 +#define PRINT_C_PTRDIFF 7 +#define PRINT_C_INTMAX 8 -#if defined(NEED_ASPRINTF) || defined(NEED_ASNPRINTF) || defined(NEED_VASPRINTF) || defined(NEED_VASNPRINTF) -# if defined(NEED_SNPRINTF_ONLY) -# undef NEED_SNPRINTF_ONLY -# endif -# if !defined(PREFER_PORTABLE_SNPRINTF) -# define PREFER_PORTABLE_SNPRINTF -# endif -#endif +#ifndef MAX +#define MAX(x, y) ((x >= y) ? x : y) +#endif /* !defined(MAX) */ +#ifndef CHARTOINT +#define CHARTOINT(ch) (ch - '0') +#endif /* !defined(CHARTOINT) */ +#ifndef ISDIGIT +#define ISDIGIT(ch) ('0' <= (unsigned char)ch && (unsigned char)ch <= '9') +#endif /* !defined(ISDIGIT) */ +#ifndef ISNAN +#define ISNAN(x) (x != x) +#endif /* !defined(ISNAN) */ +#ifndef ISINF +#define ISINF(x) (x != 0.0 && x + x == x) +#endif /* !defined(ISINF) */ -#if defined(SOLARIS_BUG_COMPATIBLE) && !defined(SOLARIS_COMPATIBLE) -#define SOLARIS_COMPATIBLE -#endif +#ifdef OUTCHAR +#undef OUTCHAR +#endif /* defined(OUTCHAR) */ +#define OUTCHAR(str, len, size, ch) \ +do { \ + if (len + 1 < size) \ + str[len] = ch; \ + (len)++; \ +} while (/* CONSTCOND */ 0) -#if defined(HPUX_BUG_COMPATIBLE) && !defined(HPUX_COMPATIBLE) -#define HPUX_COMPATIBLE -#endif +static void fmtstr(char *, size_t *, size_t, const char *, int, int, int); +static void fmtint(char *, size_t *, size_t, INTMAX_T, int, int, int, int); +static void fmtflt(char *, size_t *, size_t, LDOUBLE, int, int, int, int *); +static void printsep(char *, size_t *, size_t); +static int getnumsep(int); +static int getexponent(LDOUBLE); +static int convert(UINTMAX_T, char *, size_t, int, int); +static UINTMAX_T cast(LDOUBLE); +static UINTMAX_T myround(LDOUBLE); +static LDOUBLE mypow10(int); -#if defined(DIGITAL_UNIX_BUG_COMPATIBLE) && !defined(DIGITAL_UNIX_COMPATIBLE) -#define DIGITAL_UNIX_COMPATIBLE -#endif +extern int errno; -#if defined(PERL_BUG_COMPATIBLE) && !defined(PERL_COMPATIBLE) -#define PERL_COMPATIBLE -#endif +int +rpl_vsnprintf(char *str, size_t size, const char *format, va_list args) +{ + LDOUBLE fvalue; + INTMAX_T value; + unsigned char cvalue; + const char *strvalue; + INTMAX_T *intmaxptr; + PTRDIFF_T *ptrdiffptr; + SSIZE_T *sizeptr; + LLONG *llongptr; + long int *longptr; + int *intptr; + short int *shortptr; + signed char *charptr; + size_t len = 0; + int overflow = 0; + int base = 0; + int cflags = 0; + int flags = 0; + int width = 0; + int precision = -1; + int state = PRINT_S_DEFAULT; + char ch = *format++; -#if defined(LINUX_BUG_COMPATIBLE) && !defined(LINUX_COMPATIBLE) -#define LINUX_COMPATIBLE -#endif + /* + * C99 says: "If `n' is zero, nothing is written, and `s' may be a null + * pointer." (7.19.6.5, 2) We're forgiving and allow a NULL pointer + * even if a size larger than zero was specified. At least NetBSD's + * snprintf(3) does the same, as well as other versions of this file. + * (Though some of these versions will write to a non-NULL buffer even + * if a size of zero was specified, which violates the standard.) + */ + if (str == NULL && size != 0) + size = 0; -#include -#include -#include -#include -#include -#include -#include + while (ch != '\0') + switch (state) { + case PRINT_S_DEFAULT: + if (ch == '%') + state = PRINT_S_FLAGS; + else + OUTCHAR(str, len, size, ch); + ch = *format++; + break; + case PRINT_S_FLAGS: + switch (ch) { + case '-': + flags |= PRINT_F_MINUS; + ch = *format++; + break; + case '+': + flags |= PRINT_F_PLUS; + ch = *format++; + break; + case ' ': + flags |= PRINT_F_SPACE; + ch = *format++; + break; + case '#': + flags |= PRINT_F_NUM; + ch = *format++; + break; + case '0': + flags |= PRINT_F_ZERO; + ch = *format++; + break; + case '\'': /* SUSv2 flag (not in C99). */ + flags |= PRINT_F_QUOTE; + ch = *format++; + break; + default: + state = PRINT_S_WIDTH; + break; + } + break; + case PRINT_S_WIDTH: + if (ISDIGIT(ch)) { + ch = CHARTOINT(ch); + if (width > (INT_MAX - ch) / 10) { + overflow = 1; + goto out; + } + width = 10 * width + ch; + ch = *format++; + } else if (ch == '*') { + /* + * C99 says: "A negative field width argument is + * taken as a `-' flag followed by a positive + * field width." (7.19.6.1, 5) + */ + if ((width = va_arg(args, int)) < 0) { + flags |= PRINT_F_MINUS; + width = -width; + } + ch = *format++; + state = PRINT_S_DOT; + } else + state = PRINT_S_DOT; + break; + case PRINT_S_DOT: + if (ch == '.') { + state = PRINT_S_PRECISION; + ch = *format++; + } else + state = PRINT_S_MOD; + break; + case PRINT_S_PRECISION: + if (precision == -1) + precision = 0; + if (ISDIGIT(ch)) { + ch = CHARTOINT(ch); + if (precision > (INT_MAX - ch) / 10) { + overflow = 1; + goto out; + } + precision = 10 * precision + ch; + ch = *format++; + } else if (ch == '*') { + /* + * C99 says: "A negative precision argument is + * taken as if the precision were omitted." + * (7.19.6.1, 5) + */ + if ((precision = va_arg(args, int)) < 0) + precision = -1; + ch = *format++; + state = PRINT_S_MOD; + } else + state = PRINT_S_MOD; + break; + case PRINT_S_MOD: + switch (ch) { + case 'h': + ch = *format++; + if (ch == 'h') { /* It's a char. */ + ch = *format++; + cflags = PRINT_C_CHAR; + } else + cflags = PRINT_C_SHORT; + break; + case 'l': + ch = *format++; + if (ch == 'l') { /* It's a long long. */ + ch = *format++; + cflags = PRINT_C_LLONG; + } else + cflags = PRINT_C_LONG; + break; + case 'L': + cflags = PRINT_C_LDOUBLE; + ch = *format++; + break; + case 'j': + cflags = PRINT_C_INTMAX; + ch = *format++; + break; + case 't': + cflags = PRINT_C_PTRDIFF; + ch = *format++; + break; + case 'z': + cflags = PRINT_C_SIZE; + ch = *format++; + break; + } + state = PRINT_S_CONV; + break; + case PRINT_S_CONV: + switch (ch) { + case 'd': + /* FALLTHROUGH */ + case 'i': + switch (cflags) { + case PRINT_C_CHAR: + value = (signed char)va_arg(args, int); + break; + case PRINT_C_SHORT: + value = (short int)va_arg(args, int); + break; + case PRINT_C_LONG: + value = va_arg(args, long int); + break; + case PRINT_C_LLONG: + value = va_arg(args, LLONG); + break; + case PRINT_C_SIZE: + value = va_arg(args, SSIZE_T); + break; + case PRINT_C_INTMAX: + value = va_arg(args, INTMAX_T); + break; + case PRINT_C_PTRDIFF: + value = va_arg(args, PTRDIFF_T); + break; + default: + value = va_arg(args, int); + break; + } + fmtint(str, &len, size, value, 10, width, + precision, flags); + break; + case 'X': + flags |= PRINT_F_UP; + /* FALLTHROUGH */ + case 'x': + base = 16; + /* FALLTHROUGH */ + case 'o': + if (base == 0) + base = 8; + /* FALLTHROUGH */ + case 'u': + if (base == 0) + base = 10; + flags |= PRINT_F_UNSIGNED; + switch (cflags) { + case PRINT_C_CHAR: + value = (unsigned char)va_arg(args, + unsigned int); + break; + case PRINT_C_SHORT: + value = (unsigned short int)va_arg(args, + unsigned int); + break; + case PRINT_C_LONG: + value = va_arg(args, unsigned long int); + break; + case PRINT_C_LLONG: + value = va_arg(args, ULLONG); + break; + case PRINT_C_SIZE: + value = va_arg(args, size_t); + break; + case PRINT_C_INTMAX: + value = va_arg(args, UINTMAX_T); + break; + case PRINT_C_PTRDIFF: + value = va_arg(args, UPTRDIFF_T); + break; + default: + value = va_arg(args, unsigned int); + break; + } + fmtint(str, &len, size, value, base, width, + precision, flags); + break; + case 'A': + /* Not yet supported, we'll use "%F". */ + /* FALLTHROUGH */ + case 'F': + flags |= PRINT_F_UP; + case 'a': + /* Not yet supported, we'll use "%f". */ + /* FALLTHROUGH */ + case 'f': + if (cflags == PRINT_C_LDOUBLE) + fvalue = va_arg(args, LDOUBLE); + else + fvalue = va_arg(args, double); + fmtflt(str, &len, size, fvalue, width, + precision, flags, &overflow); + if (overflow) + goto out; + break; + case 'E': + flags |= PRINT_F_UP; + /* FALLTHROUGH */ + case 'e': + flags |= PRINT_F_TYPE_E; + if (cflags == PRINT_C_LDOUBLE) + fvalue = va_arg(args, LDOUBLE); + else + fvalue = va_arg(args, double); + fmtflt(str, &len, size, fvalue, width, + precision, flags, &overflow); + if (overflow) + goto out; + break; + case 'G': + flags |= PRINT_F_UP; + /* FALLTHROUGH */ + case 'g': + flags |= PRINT_F_TYPE_G; + if (cflags == PRINT_C_LDOUBLE) + fvalue = va_arg(args, LDOUBLE); + else + fvalue = va_arg(args, double); + /* + * If the precision is zero, it is treated as + * one (cf. C99: 7.19.6.1, 8). + */ + if (precision == 0) + precision = 1; + fmtflt(str, &len, size, fvalue, width, + precision, flags, &overflow); + if (overflow) + goto out; + break; + case 'c': + cvalue = va_arg(args, int); + OUTCHAR(str, len, size, cvalue); + break; + case 's': + strvalue = va_arg(args, char *); + fmtstr(str, &len, size, strvalue, width, + precision, flags); + break; + case 'p': + /* + * C99 says: "The value of the pointer is + * converted to a sequence of printing + * characters, in an implementation-defined + * manner." (C99: 7.19.6.1, 8) + */ + if ((strvalue = va_arg(args, void *)) == NULL) + /* + * We use the glibc format. BSD prints + * "0x0", SysV "0". + */ + fmtstr(str, &len, size, "(nil)", width, + -1, flags); + else { + /* + * We use the BSD/glibc format. SysV + * omits the "0x" prefix (which we emit + * using the PRINT_F_NUM flag). + */ + flags |= PRINT_F_NUM; + flags |= PRINT_F_UNSIGNED; + fmtint(str, &len, size, + (UINTPTR_T)strvalue, 16, width, + precision, flags); + } + break; + case 'n': + switch (cflags) { + case PRINT_C_CHAR: + charptr = va_arg(args, signed char *); + *charptr = len; + break; + case PRINT_C_SHORT: + shortptr = va_arg(args, short int *); + *shortptr = len; + break; + case PRINT_C_LONG: + longptr = va_arg(args, long int *); + *longptr = len; + break; + case PRINT_C_LLONG: + llongptr = va_arg(args, LLONG *); + *llongptr = len; + break; + case PRINT_C_SIZE: + /* + * C99 says that with the "z" length + * modifier, "a following `n' conversion + * specifier applies to a pointer to a + * signed integer type corresponding to + * size_t argument." (7.19.6.1, 7) + */ + sizeptr = va_arg(args, SSIZE_T *); + *sizeptr = len; + break; + case PRINT_C_INTMAX: + intmaxptr = va_arg(args, INTMAX_T *); + *intmaxptr = len; + break; + case PRINT_C_PTRDIFF: + ptrdiffptr = va_arg(args, PTRDIFF_T *); + *ptrdiffptr = len; + break; + default: + intptr = va_arg(args, int *); + *intptr = len; + break; + } + break; + case '%': /* Print a "%" character verbatim. */ + OUTCHAR(str, len, size, ch); + break; + default: /* Skip other characters. */ + break; + } + ch = *format++; + state = PRINT_S_DEFAULT; + base = cflags = flags = width = 0; + precision = -1; + break; + } +out: + if (len < size) + str[len] = '\0'; + else if (size > 0) + str[size - 1] = '\0'; -#ifdef isdigit -#undef isdigit -#endif -#define isdigit(c) ((c) >= '0' && (c) <= '9') + if (overflow || len >= INT_MAX) { + errno = overflow ? EOVERFLOW : ERANGE; + return -1; + } + return (int)len; +} -/* For copying strings longer or equal to 'breakeven_point' - * it is more efficient to call memcpy() than to do it inline. - * The value depends mostly on the processor architecture, - * but also on the compiler and its optimization capabilities. - * The value is not critical, some small value greater than zero - * will be just fine if you don't care to squeeze every drop - * of performance out of the code. - * - * Small values favor memcpy, large values favor inline code. - */ -#if defined(__alpha__) || defined(__alpha) -# define breakeven_point 2 /* AXP (DEC Alpha) - gcc or cc or egcs */ -#endif -#if defined(__i386__) || defined(__i386) -# define breakeven_point 12 /* Intel Pentium/Linux - gcc 2.96 */ -#endif -#if defined(__hppa) -# define breakeven_point 10 /* HP-PA - gcc */ -#endif -#if defined(__sparc__) || defined(__sparc) -# define breakeven_point 33 /* Sun Sparc 5 - gcc 2.8.1 */ -#endif +static void +fmtstr(char *str, size_t *len, size_t size, const char *value, int width, + int precision, int flags) +{ + int padlen, strln; /* Amount to pad. */ + int noprecision = (precision == -1); -/* some other values of possible interest: */ -/* #define breakeven_point 8 */ /* VAX 4000 - vaxc */ -/* #define breakeven_point 19 */ /* VAX 4000 - gcc 2.7.0 */ + if (value == NULL) /* We're forgiving. */ + value = "(null)"; -#ifndef breakeven_point -# define breakeven_point 6 /* some reasonable one-size-fits-all value */ -#endif + /* If a precision was specified, don't read the string past it. */ + for (strln = 0; value[strln] != '\0' && + (noprecision || strln < precision); strln++) + continue; -#define fast_memcpy(d,s,n) \ - { register size_t nn = (size_t)(n); \ - if (nn >= breakeven_point) memcpy((d), (s), nn); \ - else if (nn > 0) { /* proc call overhead is worth only for large strings*/\ - register char *dd; register const char *ss; \ - for (ss=(s), dd=(d); nn>0; nn--) *dd++ = *ss++; } } + if ((padlen = width - strln) < 0) + padlen = 0; + if (flags & PRINT_F_MINUS) /* Left justify. */ + padlen = -padlen; -#define fast_memset(d,c,n) \ - { register size_t nn = (size_t)(n); \ - if (nn >= breakeven_point) memset((d), (int)(c), nn); \ - else if (nn > 0) { /* proc call overhead is worth only for large strings*/\ - register char *dd; register const int cc=(int)(c); \ - for (dd=(d); nn>0; nn--) *dd++ = cc; } } + while (padlen > 0) { /* Leading spaces. */ + OUTCHAR(str, *len, size, ' '); + padlen--; + } + while (*value != '\0' && (noprecision || precision-- > 0)) { + OUTCHAR(str, *len, size, *value); + value++; + } + while (padlen < 0) { /* Trailing spaces. */ + OUTCHAR(str, *len, size, ' '); + padlen++; + } +} -/* prototypes */ +static void +fmtint(char *str, size_t *len, size_t size, INTMAX_T value, int base, int width, + int precision, int flags) +{ + UINTMAX_T uvalue; + char iconvert[MAX_CONVERT_LENGTH]; + char sign = 0; + char hexprefix = 0; + int spadlen = 0; /* Amount to space pad. */ + int zpadlen = 0; /* Amount to zero pad. */ + int pos; + int separators = (flags & PRINT_F_QUOTE); + int noprecision = (precision == -1); -#if defined(NEED_ASPRINTF) -int asprintf (char **ptr, const char *fmt, /*args*/ ...); -#endif -#if defined(NEED_VASPRINTF) -int vasprintf (char **ptr, const char *fmt, va_list ap); -#endif -#if defined(NEED_ASNPRINTF) -int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...); -#endif -#if defined(NEED_VASNPRINTF) -int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap); -#endif + if (flags & PRINT_F_UNSIGNED) + uvalue = value; + else { + uvalue = (value >= 0) ? value : -value; + if (value < 0) + sign = '-'; + else if (flags & PRINT_F_PLUS) /* Do a sign. */ + sign = '+'; + else if (flags & PRINT_F_SPACE) + sign = ' '; + } -#if defined(HAVE_SNPRINTF) -/* declare our portable snprintf routine under name portable_snprintf */ -/* declare our portable vsnprintf routine under name portable_vsnprintf */ -#else -/* declare our portable routines under names snprintf and vsnprintf */ -#define portable_snprintf snprintf -#if !defined(NEED_SNPRINTF_ONLY) -#define portable_vsnprintf vsnprintf -#endif -#endif + pos = convert(uvalue, iconvert, sizeof(iconvert), base, + flags & PRINT_F_UP); -#if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) -int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...); -#if !defined(NEED_SNPRINTF_ONLY) -int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap); -#endif -#endif + if (flags & PRINT_F_NUM && uvalue != 0) { + /* + * C99 says: "The result is converted to an `alternative form'. + * For `o' conversion, it increases the precision, if and only + * if necessary, to force the first digit of the result to be a + * zero (if the value and precision are both 0, a single 0 is + * printed). For `x' (or `X') conversion, a nonzero result has + * `0x' (or `0X') prefixed to it." (7.19.6.1, 6) + */ + switch (base) { + case 8: + if (precision <= pos) + precision = pos + 1; + break; + case 16: + hexprefix = (flags & PRINT_F_UP) ? 'X' : 'x'; + break; + } + } -/* declarations */ + if (separators) /* Get the number of group separators we'll print. */ + separators = getnumsep(pos); -static char credits[] = "\n\ -@(#)snprintf.c, v2.2: Mark Martinec, \n\ -@(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic License applies.\n\ -@(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n"; + zpadlen = precision - pos - separators; + spadlen = width /* Minimum field width. */ + - separators /* Number of separators. */ + - MAX(precision, pos) /* Number of integer digits. */ + - ((sign != 0) ? 1 : 0) /* Will we print a sign? */ + - ((hexprefix != 0) ? 2 : 0); /* Will we print a prefix? */ -#if defined(NEED_ASPRINTF) -int asprintf(char **ptr, const char *fmt, /*args*/ ...) { - va_list ap; - size_t str_m; - int str_l; + if (zpadlen < 0) + zpadlen = 0; + if (spadlen < 0) + spadlen = 0; - *ptr = NULL; - va_start(ap, fmt); /* measure the required size */ - str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap); - va_end(ap); - assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ - *ptr = (char *) malloc(str_m = (size_t)str_l + 1); - if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } - else { - int str_l2; - va_start(ap, fmt); - str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); - va_end(ap); - assert(str_l2 == str_l); - } - return str_l; + /* + * C99 says: "If the `0' and `-' flags both appear, the `0' flag is + * ignored. For `d', `i', `o', `u', `x', and `X' conversions, if a + * precision is specified, the `0' flag is ignored." (7.19.6.1, 6) + */ + if (flags & PRINT_F_MINUS) /* Left justify. */ + spadlen = -spadlen; + else if (flags & PRINT_F_ZERO && noprecision) { + zpadlen += spadlen; + spadlen = 0; + } + while (spadlen > 0) { /* Leading spaces. */ + OUTCHAR(str, *len, size, ' '); + spadlen--; + } + if (sign != 0) /* Sign. */ + OUTCHAR(str, *len, size, sign); + if (hexprefix != 0) { /* A "0x" or "0X" prefix. */ + OUTCHAR(str, *len, size, '0'); + OUTCHAR(str, *len, size, hexprefix); + } + while (zpadlen > 0) { /* Leading zeros. */ + OUTCHAR(str, *len, size, '0'); + zpadlen--; + } + while (pos > 0) { /* The actual digits. */ + pos--; + OUTCHAR(str, *len, size, iconvert[pos]); + if (separators > 0 && pos > 0 && pos % 3 == 0) + printsep(str, len, size); + } + while (spadlen < 0) { /* Trailing spaces. */ + OUTCHAR(str, *len, size, ' '); + spadlen++; + } } -#endif -#if defined(NEED_VASPRINTF) -int vasprintf(char **ptr, const char *fmt, va_list ap) { - size_t str_m; - int str_l; +static void +fmtflt(char *str, size_t *len, size_t size, LDOUBLE fvalue, int width, + int precision, int flags, int *overflow) +{ + LDOUBLE ufvalue; + UINTMAX_T intpart; + UINTMAX_T fracpart; + UINTMAX_T mask; + const char *infnan = NULL; + char iconvert[MAX_CONVERT_LENGTH]; + char fconvert[MAX_CONVERT_LENGTH]; + char econvert[4]; /* "e-12" (without nul-termination). */ + char esign = 0; + char sign = 0; + int leadfraczeros = 0; + int exponent = 0; + int emitpoint = 0; + int omitzeros = 0; + int omitcount = 0; + int padlen = 0; + int epos = 0; + int fpos = 0; + int ipos = 0; + int separators = (flags & PRINT_F_QUOTE); + int estyle = (flags & PRINT_F_TYPE_E); +#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT + struct lconv *lc = localeconv(); +#endif /* HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT */ - *ptr = NULL; - { va_list ap2; - va_copy(ap2, ap); /* don't consume the original ap, we'll need it again */ - str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap2);/*get required size*/ - va_end(ap2); - } - assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ - *ptr = (char *) malloc(str_m = (size_t)str_l + 1); - if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } - else { - int str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); - assert(str_l2 == str_l); - } - return str_l; + /* + * AIX' man page says the default is 0, but C99 and at least Solaris' + * and NetBSD's man pages say the default is 6, and sprintf(3) on AIX + * defaults to 6. + */ + if (precision == -1) + precision = 6; + + if (fvalue < 0.0) + sign = '-'; + else if (flags & PRINT_F_PLUS) /* Do a sign. */ + sign = '+'; + else if (flags & PRINT_F_SPACE) + sign = ' '; + + if (ISNAN(fvalue)) + infnan = (flags & PRINT_F_UP) ? "NAN" : "nan"; + else if (ISINF(fvalue)) + infnan = (flags & PRINT_F_UP) ? "INF" : "inf"; + + if (infnan != NULL) { + if (sign != 0) + iconvert[ipos++] = sign; + while (*infnan != '\0') + iconvert[ipos++] = *infnan++; + fmtstr(str, len, size, iconvert, width, ipos, flags); + return; + } + + /* "%e" (or "%E") or "%g" (or "%G") conversion. */ + if (flags & PRINT_F_TYPE_E || flags & PRINT_F_TYPE_G) { + if (flags & PRINT_F_TYPE_G) { + /* + * For "%g" (and "%G") conversions, the precision + * specifies the number of significant digits, which + * includes the digits in the integer part. The + * conversion will or will not be using "e-style" (like + * "%e" or "%E" conversions) depending on the precision + * and on the exponent. However, the exponent can be + * affected by rounding the converted value, so we'll + * leave this decision for later. Until then, we'll + * assume that we're going to do an "e-style" conversion + * (in order to get the exponent calculated). For + * "e-style", the precision must be decremented by one. + */ + precision--; + /* + * For "%g" (and "%G") conversions, trailing zeros are + * removed from the fractional portion of the result + * unless the "#" flag was specified. + */ + if (!(flags & PRINT_F_NUM)) + omitzeros = 1; + } + exponent = getexponent(fvalue); + estyle = 1; + } + +again: + /* + * Sorry, we only support 9, 19, or 38 digits (that is, the number of + * digits of the 32-bit, the 64-bit, or the 128-bit UINTMAX_MAX value + * minus one) past the decimal point due to our conversion method. + */ + switch (sizeof(UINTMAX_T)) { + case 16: + if (precision > 38) + precision = 38; + break; + case 8: + if (precision > 19) + precision = 19; + break; + default: + if (precision > 9) + precision = 9; + break; + } + + ufvalue = (fvalue >= 0.0) ? fvalue : -fvalue; + if (estyle) /* We want exactly one integer digit. */ + ufvalue /= mypow10(exponent); + + if ((intpart = cast(ufvalue)) == UINTMAX_MAX) { + *overflow = 1; + return; + } + + /* + * Factor of ten with the number of digits needed for the fractional + * part. For example, if the precision is 3, the mask will be 1000. + */ + mask = mypow10(precision); + /* + * We "cheat" by converting the fractional part to integer by + * multiplying by a factor of ten. + */ + if ((fracpart = myround(mask * (ufvalue - intpart))) >= mask) { + /* + * For example, ufvalue = 2.99962, intpart = 2, and mask = 1000 + * (because precision = 3). Now, myround(1000 * 0.99962) will + * return 1000. So, the integer part must be incremented by one + * and the fractional part must be set to zero. + */ + intpart++; + fracpart = 0; + if (estyle && intpart == 10) { + /* + * The value was rounded up to ten, but we only want one + * integer digit if using "e-style". So, the integer + * part must be set to one and the exponent must be + * incremented by one. + */ + intpart = 1; + exponent++; + } + } + + /* + * Now that we know the real exponent, we can check whether or not to + * use "e-style" for "%g" (and "%G") conversions. If we don't need + * "e-style", the precision must be adjusted and the integer and + * fractional parts must be recalculated from the original value. + * + * C99 says: "Let P equal the precision if nonzero, 6 if the precision + * is omitted, or 1 if the precision is zero. Then, if a conversion + * with style `E' would have an exponent of X: + * + * - if P > X >= -4, the conversion is with style `f' (or `F') and + * precision P - (X + 1). + * + * - otherwise, the conversion is with style `e' (or `E') and precision + * P - 1." (7.19.6.1, 8) + * + * Note that we had decremented the precision by one. + */ + if (flags & PRINT_F_TYPE_G && estyle && + precision + 1 > exponent && exponent >= -4) { + precision -= exponent; + estyle = 0; + goto again; + } + + if (estyle) { + if (exponent < 0) { + exponent = -exponent; + esign = '-'; + } else + esign = '+'; + + /* + * Convert the exponent. The sizeof(econvert) is 4. So, the + * econvert buffer can hold e.g. "e+99" and "e-99". We don't + * support an exponent which contains more than two digits. + * Therefore, the following stores are safe. + */ + epos = convert(exponent, econvert, 2, 10, 0); + /* + * C99 says: "The exponent always contains at least two digits, + * and only as many more digits as necessary to represent the + * exponent." (7.19.6.1, 8) + */ + if (epos == 1) + econvert[epos++] = '0'; + econvert[epos++] = esign; + econvert[epos++] = (flags & PRINT_F_UP) ? 'E' : 'e'; + } + + /* Convert the integer part and the fractional part. */ + ipos = convert(intpart, iconvert, sizeof(iconvert), 10, 0); + if (fracpart != 0) /* convert() would return 1 if fracpart == 0. */ + fpos = convert(fracpart, fconvert, sizeof(fconvert), 10, 0); + + leadfraczeros = precision - fpos; + + if (omitzeros) { + if (fpos > 0) /* Omit trailing fractional part zeros. */ + while (omitcount < fpos && fconvert[omitcount] == '0') + omitcount++; + else { /* The fractional part is zero, omit it completely. */ + omitcount = precision; + leadfraczeros = 0; + } + precision -= omitcount; + } + + /* + * Print a decimal point if either the fractional part is non-zero + * and/or the "#" flag was specified. + */ + if (precision > 0 || flags & PRINT_F_NUM) + emitpoint = 1; + if (separators) /* Get the number of group separators we'll print. */ + separators = getnumsep(ipos); + + padlen = width /* Minimum field width. */ + - ipos /* Number of integer digits. */ + - epos /* Number of exponent characters. */ + - precision /* Number of fractional digits. */ + - separators /* Number of group separators. */ + - (emitpoint ? 1 : 0) /* Will we print a decimal point? */ + - ((sign != 0) ? 1 : 0); /* Will we print a sign character? */ + + if (padlen < 0) + padlen = 0; + + /* + * C99 says: "If the `0' and `-' flags both appear, the `0' flag is + * ignored." (7.19.6.1, 6) + */ + if (flags & PRINT_F_MINUS) /* Left justifty. */ + padlen = -padlen; + else if (flags & PRINT_F_ZERO && padlen > 0) { + if (sign != 0) { /* Sign. */ + OUTCHAR(str, *len, size, sign); + sign = 0; + } + while (padlen > 0) { /* Leading zeros. */ + OUTCHAR(str, *len, size, '0'); + padlen--; + } + } + while (padlen > 0) { /* Leading spaces. */ + OUTCHAR(str, *len, size, ' '); + padlen--; + } + if (sign != 0) /* Sign. */ + OUTCHAR(str, *len, size, sign); + while (ipos > 0) { /* Integer part. */ + ipos--; + OUTCHAR(str, *len, size, iconvert[ipos]); + if (separators > 0 && ipos > 0 && ipos % 3 == 0) + printsep(str, len, size); + } + if (emitpoint) { /* Decimal point. */ +#if HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT + if (lc->decimal_point != NULL && *lc->decimal_point != '\0') + OUTCHAR(str, *len, size, *lc->decimal_point); + else /* We'll always print some decimal point character. */ +#endif /* HAVE_LOCALECONV && HAVE_LCONV_DECIMAL_POINT */ + OUTCHAR(str, *len, size, '.'); + } + while (leadfraczeros > 0) { /* Leading fractional part zeros. */ + OUTCHAR(str, *len, size, '0'); + leadfraczeros--; + } + while (fpos > omitcount) { /* The remaining fractional part. */ + fpos--; + OUTCHAR(str, *len, size, fconvert[fpos]); + } + while (epos > 0) { /* Exponent. */ + epos--; + OUTCHAR(str, *len, size, econvert[epos]); + } + while (padlen < 0) { /* Trailing spaces. */ + OUTCHAR(str, *len, size, ' '); + padlen++; + } } -#endif -#if defined(NEED_ASNPRINTF) -int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...) { - va_list ap; - int str_l; +static void +printsep(char *str, size_t *len, size_t size) +{ +#if HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP + struct lconv *lc = localeconv(); + int i; - *ptr = NULL; - va_start(ap, fmt); /* measure the required size */ - str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap); - va_end(ap); - assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ - if ((size_t)str_l + 1 < str_m) str_m = (size_t)str_l + 1; /* truncate */ - /* if str_m is 0, no buffer is allocated, just set *ptr to NULL */ - if (str_m == 0) { /* not interested in resulting string, just return size */ - } else { - *ptr = (char *) malloc(str_m); - if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } - else { - int str_l2; - va_start(ap, fmt); - str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); - va_end(ap); - assert(str_l2 == str_l); - } - } - return str_l; + if (lc->thousands_sep != NULL) + for (i = 0; lc->thousands_sep[i] != '\0'; i++) + OUTCHAR(str, *len, size, lc->thousands_sep[i]); + else +#endif /* HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP */ + OUTCHAR(str, *len, size, ','); } -#endif -#if defined(NEED_VASNPRINTF) -int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap) { - int str_l; +static int +getnumsep(int digits) +{ + int separators = (digits - ((digits % 3 == 0) ? 1 : 0)) / 3; +#if HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP + int strln; + struct lconv *lc = localeconv(); - *ptr = NULL; - { va_list ap2; - va_copy(ap2, ap); /* don't consume the original ap, we'll need it again */ - str_l = portable_vsnprintf(NULL, (size_t)0, fmt, ap2);/*get required size*/ - va_end(ap2); - } - assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */ - if ((size_t)str_l + 1 < str_m) str_m = (size_t)str_l + 1; /* truncate */ - /* if str_m is 0, no buffer is allocated, just set *ptr to NULL */ - if (str_m == 0) { /* not interested in resulting string, just return size */ - } else { - *ptr = (char *) malloc(str_m); - if (*ptr == NULL) { errno = ENOMEM; str_l = -1; } - else { - int str_l2 = portable_vsnprintf(*ptr, str_m, fmt, ap); - assert(str_l2 == str_l); - } - } - return str_l; + /* We support an arbitrary separator length (including zero). */ + if (lc->thousands_sep != NULL) { + for (strln = 0; lc->thousands_sep[strln] != '\0'; strln++) + continue; + separators *= strln; + } +#endif /* HAVE_LOCALECONV && HAVE_LCONV_THOUSANDS_SEP */ + return separators; } -#endif -/* - * If the system does have snprintf and the portable routine is not - * specifically required, this module produces no code for snprintf/vsnprintf. - */ -#if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) +static int +getexponent(LDOUBLE value) +{ + LDOUBLE tmp = (value >= 0.0) ? value : -value; + int exponent = 0; -#if !defined(NEED_SNPRINTF_ONLY) -int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...) { - va_list ap; - int str_l; + /* + * We check for 99 > exponent > -99 in order to work around possible + * endless loops which could happen (at least) in the second loop (at + * least) if we're called with an infinite value. However, we checked + * for infinity before calling this function using our ISINF() macro, so + * this might be somewhat paranoid. + */ + while (tmp < 1.0 && tmp > 0.0 && --exponent > -99) + tmp *= 10; + while (tmp >= 10.0 && ++exponent < 99) + tmp /= 10; - va_start(ap, fmt); - str_l = portable_vsnprintf(str, str_m, fmt, ap); - va_end(ap); - return str_l; + return exponent; } -#endif -#if defined(NEED_SNPRINTF_ONLY) -int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...) { -#else -int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { -#endif +static int +convert(UINTMAX_T value, char *buf, size_t size, int base, int caps) +{ + const char *digits = caps ? "0123456789ABCDEF" : "0123456789abcdef"; + size_t pos = 0; -#if defined(NEED_SNPRINTF_ONLY) - va_list ap; -#endif - size_t str_l = 0; - const char *p = fmt; + /* We return an unterminated buffer with the digits in reverse order. */ + do { + buf[pos++] = digits[value % base]; + value /= base; + } while (value != 0 && pos < size); -/* In contrast with POSIX, the ISO C99 now says - * that str can be NULL and str_m can be 0. - * This is more useful than the old: if (str_m < 1) return -1; */ + return (int)pos; +} -#if defined(NEED_SNPRINTF_ONLY) - va_start(ap, fmt); -#endif - if (!p) p = ""; - while (*p) { - if (*p != '%') { - /* if (str_l < str_m) str[str_l++] = *p++; -- this would be sufficient */ - /* but the following code achieves better performance for cases - * where format string is long and contains few conversions */ - const char *q = strchr(p+1,'%'); - size_t n = !q ? strlen(p) : (q-p); - if (str_l < str_m) { - size_t avail = str_m-str_l; - fast_memcpy(str+str_l, p, (n>avail?avail:n)); - } - p += n; str_l += n; - } else { - const char *starting_p; - size_t min_field_width = 0, precision = 0; - int zero_padding = 0, precision_specified = 0, justify_left = 0; - int alternate_form = 0, force_sign = 0; - int space_for_positive = 1; /* If both the ' ' and '+' flags appear, - the ' ' flag should be ignored. */ - char length_modifier = '\0'; /* allowed values: \0, h, l, L */ - char tmp[32];/* temporary buffer for simple numeric->string conversion */ +static UINTMAX_T +cast(LDOUBLE value) +{ + UINTMAX_T result; - const char *str_arg; /* string address in case of string argument */ - size_t str_arg_l; /* natural field width of arg without padding - and sign */ - unsigned char uchar_arg; - /* unsigned char argument value - only defined for c conversion. - N.B. standard explicitly states the char argument for - the c conversion is unsigned */ + /* + * We check for ">=" and not for ">" because if UINTMAX_MAX cannot be + * represented exactly as an LDOUBLE value (but is less than LDBL_MAX), + * it may be increased to the nearest higher representable value for the + * comparison (cf. C99: 6.3.1.4, 2). It might then equal the LDOUBLE + * value although converting the latter to UINTMAX_T would overflow. + */ + if (value >= UINTMAX_MAX) + return UINTMAX_MAX; - size_t number_of_zeros_to_pad = 0; - /* number of zeros to be inserted for numeric conversions - as required by the precision or minimal field width */ + result = value; + /* + * At least on NetBSD/sparc64 3.0.2 and 4.99.30, casting long double to + * an integer type converts e.g. 1.9 to 2 instead of 1 (which violates + * the standard). Sigh. + */ + return (result <= value) ? result : result - 1; +} - size_t zero_padding_insertion_ind = 0; - /* index into tmp where zero padding is to be inserted */ +static UINTMAX_T +myround(LDOUBLE value) +{ + UINTMAX_T intpart = cast(value); - char fmt_spec = '\0'; - /* current conversion specifier character */ + return ((value -= intpart) < 0.5) ? intpart : intpart + 1; +} - str_arg = credits;/* just to make compiler happy (defined but not used)*/ - str_arg = NULL; - starting_p = p; p++; /* skip '%' */ - /* parse flags */ - while (*p == '0' || *p == '-' || *p == '+' || - *p == ' ' || *p == '#' || *p == '\'') { - switch (*p) { - case '0': zero_padding = 1; break; - case '-': justify_left = 1; break; - case '+': force_sign = 1; space_for_positive = 0; break; - case ' ': force_sign = 1; - /* If both the ' ' and '+' flags appear, the ' ' flag should be ignored */ -#ifdef PERL_COMPATIBLE - /* ... but in Perl the last of ' ' and '+' applies */ - space_for_positive = 1; -#endif - break; - case '#': alternate_form = 1; break; - case '\'': break; - } - p++; - } - /* If the '0' and '-' flags both appear, the '0' flag should be ignored. */ +static LDOUBLE +mypow10(int exponent) +{ + LDOUBLE result = 1; - /* parse field width */ - if (*p == '*') { - int j; - p++; j = va_arg(ap, int); - if (j >= 0) min_field_width = j; - else { min_field_width = -j; justify_left = 1; } - } else if (isdigit((int)(*p))) { - /* size_t could be wider than unsigned int; - make sure we treat argument like common implementations do */ - unsigned int uj = *p++ - '0'; - while (isdigit((int)(*p))) uj = 10*uj + (unsigned int)(*p++ - '0'); - min_field_width = uj; - } - /* parse precision */ - if (*p == '.') { - p++; precision_specified = 1; - if (*p == '*') { - int j = va_arg(ap, int); - p++; - if (j >= 0) precision = j; - else { - precision_specified = 0; precision = 0; - /* NOTE: - * Solaris 2.6 man page claims that in this case the precision - * should be set to 0. Digital Unix 4.0, HPUX 10 and BSD man page - * claim that this case should be treated as unspecified precision, - * which is what we do here. - */ - } - } else if (isdigit((int)(*p))) { - /* size_t could be wider than unsigned int; - make sure we treat argument like common implementations do */ - unsigned int uj = *p++ - '0'; - while (isdigit((int)(*p))) uj = 10*uj + (unsigned int)(*p++ - '0'); - precision = uj; - } - } - /* parse 'h', 'l' and 'll' length modifiers */ - if (*p == 'h' || *p == 'l') { - length_modifier = *p; p++; - if (length_modifier == 'l' && *p == 'l') { /* double l = long long */ -#ifdef SNPRINTF_LONGLONG_SUPPORT - length_modifier = '2'; /* double l encoded as '2' */ -#else - length_modifier = 'l'; /* treat it as a single 'l' */ -#endif - p++; - } - } - fmt_spec = *p; - /* common synonyms: */ - switch (fmt_spec) { - case 'i': fmt_spec = 'd'; break; - case 'D': fmt_spec = 'd'; length_modifier = 'l'; break; - case 'U': fmt_spec = 'u'; length_modifier = 'l'; break; - case 'O': fmt_spec = 'o'; length_modifier = 'l'; break; - default: break; - } - /* get parameter value, do initial processing */ - switch (fmt_spec) { - case '%': /* % behaves similar to 's' regarding flags and field widths */ - case 'c': /* c behaves similar to 's' regarding flags and field widths */ - case 's': - length_modifier = '\0'; /* wint_t and wchar_t not supported */ - /* the result of zero padding flag with non-numeric conversion specifier*/ - /* is undefined. Solaris and HPUX 10 does zero padding in this case, */ - /* Digital Unix and Linux does not. */ -#if !defined(SOLARIS_COMPATIBLE) && !defined(HPUX_COMPATIBLE) - zero_padding = 0; /* turn zero padding off for string conversions */ -#endif - str_arg_l = 1; - switch (fmt_spec) { - case '%': - str_arg = p; break; - case 'c': { - int j = va_arg(ap, int); - uchar_arg = (unsigned char) j; /* standard demands unsigned char */ - str_arg = (const char *) &uchar_arg; - break; - } - case 's': - str_arg = va_arg(ap, const char *); - if (!str_arg) str_arg_l = 0; - /* make sure not to address string beyond the specified precision !!! */ - else if (!precision_specified) str_arg_l = strlen(str_arg); - /* truncate string if necessary as requested by precision */ - else if (precision == 0) str_arg_l = 0; - else { - /* memchr on HP does not like n > 2^31 !!! */ - const char *q = memchr(str_arg, '\0', - precision <= 0x7fffffff ? precision : 0x7fffffff); - str_arg_l = !q ? precision : (q-str_arg); - } - break; - default: break; - } - break; - case 'd': case 'u': case 'o': case 'x': case 'X': case 'p': { - /* NOTE: the u, o, x, X and p conversion specifiers imply - the value is unsigned; d implies a signed value */ + while (exponent > 0) { + result *= 10; + exponent--; + } + while (exponent < 0) { + result /= 10; + exponent++; + } + return result; +} +#endif /* !HAVE_VSNPRINTF */ - int arg_sign = 0; - /* 0 if numeric argument is zero (or if pointer is NULL for 'p'), - +1 if greater than zero (or nonzero for unsigned arguments), - -1 if negative (unsigned argument is never negative) */ +#if !HAVE_VASPRINTF +#if NEED_MYMEMCPY +void * +mymemcpy(void *dst, void *src, size_t len) +{ + const char *from = src; + char *to = dst; - int int_arg = 0; unsigned int uint_arg = 0; - /* only defined for length modifier h, or for no length modifiers */ + /* No need for optimization, we use this only to replace va_copy(3). */ + while (len-- > 0) + *to++ = *from++; + return dst; +} +#endif /* NEED_MYMEMCPY */ - long int long_arg = 0; unsigned long int ulong_arg = 0; - /* only defined for length modifier l */ +int +rpl_vasprintf(char **ret, const char *format, va_list ap) +{ + size_t size; + int len; + va_list aq; - void *ptr_arg = NULL; - /* pointer argument value -only defined for p conversion */ + VA_COPY(aq, ap); + len = vsnprintf(NULL, 0, format, aq); + VA_END_COPY(aq); + if (len < 0 || (*ret = malloc(size = len + 1)) == NULL) + return -1; + return vsnprintf(*ret, size, format, ap); +} +#endif /* !HAVE_VASPRINTF */ -#ifdef SNPRINTF_LONGLONG_SUPPORT - long long int long_long_arg = 0; - unsigned long long int ulong_long_arg = 0; - /* only defined for length modifier ll */ -#endif - if (fmt_spec == 'p') { - /* HPUX 10: An l, h, ll or L before any other conversion character - * (other than d, i, u, o, x, or X) is ignored. - * Digital Unix: - * not specified, but seems to behave as HPUX does. - * Solaris: If an h, l, or L appears before any other conversion - * specifier (other than d, i, u, o, x, or X), the behavior - * is undefined. (Actually %hp converts only 16-bits of address - * and %llp treats address as 64-bit data which is incompatible - * with (void *) argument on a 32-bit system). - */ -#ifdef SOLARIS_COMPATIBLE -# ifdef SOLARIS_BUG_COMPATIBLE - /* keep length modifiers even if it represents 'll' */ -# else - if (length_modifier == '2') length_modifier = '\0'; -# endif +#if !HAVE_SNPRINTF +#if HAVE_STDARG_H +int +rpl_snprintf(char *str, size_t size, const char *format, ...) #else - length_modifier = '\0'; -#endif - ptr_arg = va_arg(ap, void *); - if (ptr_arg != NULL) arg_sign = 1; - } else if (fmt_spec == 'd') { /* signed */ - switch (length_modifier) { - case '\0': - case 'h': - /* It is non-portable to specify a second argument of char or short - * to va_arg, because arguments seen by the called function - * are not char or short. C converts char and short arguments - * to int before passing them to a function. - */ - int_arg = va_arg(ap, int); - if (int_arg > 0) arg_sign = 1; - else if (int_arg < 0) arg_sign = -1; - break; - case 'l': - long_arg = va_arg(ap, long int); - if (long_arg > 0) arg_sign = 1; - else if (long_arg < 0) arg_sign = -1; - break; -#ifdef SNPRINTF_LONGLONG_SUPPORT - case '2': - long_long_arg = va_arg(ap, long long int); - if (long_long_arg > 0) arg_sign = 1; - else if (long_long_arg < 0) arg_sign = -1; - break; -#endif - } - } else { /* unsigned */ - switch (length_modifier) { - case '\0': - case 'h': - uint_arg = va_arg(ap, unsigned int); - if (uint_arg) arg_sign = 1; - break; - case 'l': - ulong_arg = va_arg(ap, unsigned long int); - if (ulong_arg) arg_sign = 1; - break; -#ifdef SNPRINTF_LONGLONG_SUPPORT - case '2': - ulong_long_arg = va_arg(ap, unsigned long long int); - if (ulong_long_arg) arg_sign = 1; - break; -#endif - } - } - str_arg = tmp; str_arg_l = 0; - /* NOTE: - * For d, i, u, o, x, and X conversions, if precision is specified, - * the '0' flag should be ignored. This is so with Solaris 2.6, - * Digital UNIX 4.0, HPUX 10, Linux, FreeBSD, NetBSD; but not with Perl. - */ -#ifndef PERL_COMPATIBLE - if (precision_specified) zero_padding = 0; -#endif - if (fmt_spec == 'd') { - if (force_sign && arg_sign >= 0) - tmp[str_arg_l++] = space_for_positive ? ' ' : '+'; - /* leave negative numbers for sprintf to handle, - to avoid handling tricky cases like (short int)(-32768) */ -#ifdef LINUX_COMPATIBLE - } else if (fmt_spec == 'p' && force_sign && arg_sign > 0) { - tmp[str_arg_l++] = space_for_positive ? ' ' : '+'; -#endif - } else if (alternate_form) { - if (arg_sign != 0 && (fmt_spec == 'x' || fmt_spec == 'X') ) - { tmp[str_arg_l++] = '0'; tmp[str_arg_l++] = fmt_spec; } - /* alternate form should have no effect for p conversion, but ... */ -#ifdef HPUX_COMPATIBLE - else if (fmt_spec == 'p' - /* HPUX 10: for an alternate form of p conversion, - * a nonzero result is prefixed by 0x. */ -#ifndef HPUX_BUG_COMPATIBLE - /* Actually it uses 0x prefix even for a zero value. */ - && arg_sign != 0 -#endif - ) { tmp[str_arg_l++] = '0'; tmp[str_arg_l++] = 'x'; } -#endif - } - zero_padding_insertion_ind = str_arg_l; - if (!precision_specified) precision = 1; /* default precision is 1 */ - if (precision == 0 && arg_sign == 0 -#if defined(HPUX_BUG_COMPATIBLE) || defined(LINUX_COMPATIBLE) - && fmt_spec != 'p' - /* HPUX 10 man page claims: With conversion character p the result of - * converting a zero value with a precision of zero is a null string. - * Actually HP returns all zeroes, and Linux returns "(nil)". */ -#endif - ) { - /* converted to null string */ - /* When zero value is formatted with an explicit precision 0, - the resulting formatted string is empty (d, i, u, o, x, X, p). */ - } else { - char f[5]; int f_l = 0; - f[f_l++] = '%'; /* construct a simple format string for sprintf */ - if (!length_modifier) { } - else if (length_modifier=='2') { f[f_l++] = 'l'; f[f_l++] = 'l'; } - else f[f_l++] = length_modifier; - f[f_l++] = fmt_spec; f[f_l++] = '\0'; - if (fmt_spec == 'p') str_arg_l += sprintf(tmp+str_arg_l, f, ptr_arg); - else if (fmt_spec == 'd') { /* signed */ - switch (length_modifier) { - case '\0': - case 'h': str_arg_l+=sprintf(tmp+str_arg_l, f, int_arg); break; - case 'l': str_arg_l+=sprintf(tmp+str_arg_l, f, long_arg); break; -#ifdef SNPRINTF_LONGLONG_SUPPORT - case '2': str_arg_l+=sprintf(tmp+str_arg_l,f,long_long_arg); break; -#endif - } - } else { /* unsigned */ - switch (length_modifier) { - case '\0': - case 'h': str_arg_l+=sprintf(tmp+str_arg_l, f, uint_arg); break; - case 'l': str_arg_l+=sprintf(tmp+str_arg_l, f, ulong_arg); break; -#ifdef SNPRINTF_LONGLONG_SUPPORT - case '2': str_arg_l+=sprintf(tmp+str_arg_l,f,ulong_long_arg);break; -#endif - } - } - /* include the optional minus sign and possible "0x" - in the region before the zero padding insertion point */ - if (zero_padding_insertion_ind < str_arg_l && - tmp[zero_padding_insertion_ind] == '-') { - zero_padding_insertion_ind++; - } - if (zero_padding_insertion_ind+1 < str_arg_l && - tmp[zero_padding_insertion_ind] == '0' && - (tmp[zero_padding_insertion_ind+1] == 'x' || - tmp[zero_padding_insertion_ind+1] == 'X') ) { - zero_padding_insertion_ind += 2; - } - } - { size_t num_of_digits = str_arg_l - zero_padding_insertion_ind; - if (alternate_form && fmt_spec == 'o' -#ifdef HPUX_COMPATIBLE /* ("%#.o",0) -> "" */ - && (str_arg_l > 0) -#endif -#ifdef DIGITAL_UNIX_BUG_COMPATIBLE /* ("%#o",0) -> "00" */ +int +rpl_snprintf(va_alist) va_dcl +#endif /* HAVE_STDARG_H */ +{ +#if !HAVE_STDARG_H + char *str; + size_t size; + char *format; +#endif /* HAVE_STDARG_H */ + va_list ap; + int len; + + VA_START(ap, format); + VA_SHIFT(ap, str, char *); + VA_SHIFT(ap, size, size_t); + VA_SHIFT(ap, format, const char *); + len = vsnprintf(str, size, format, ap); + va_end(ap); + return len; +} +#endif /* !HAVE_SNPRINTF */ + +#if !HAVE_ASPRINTF +#if HAVE_STDARG_H +int +rpl_asprintf(char **ret, const char *format, ...) #else - /* unless zero is already the first character */ - && !(zero_padding_insertion_ind < str_arg_l - && tmp[zero_padding_insertion_ind] == '0') -#endif - ) { /* assure leading zero for alternate-form octal numbers */ - if (!precision_specified || precision < num_of_digits+1) { - /* precision is increased to force the first character to be zero, - except if a zero value is formatted with an explicit precision - of zero */ - precision = num_of_digits+1; precision_specified = 1; - } - } - /* zero padding to specified precision? */ - if (num_of_digits < precision) - number_of_zeros_to_pad = precision - num_of_digits; - } - /* zero padding to specified minimal field width? */ - if (!justify_left && zero_padding) { - int n = min_field_width - (str_arg_l+number_of_zeros_to_pad); - if (n > 0) number_of_zeros_to_pad += n; - } - break; - } - default: /* unrecognized conversion specifier, keep format string as-is*/ - zero_padding = 0; /* turn zero padding off for non-numeric convers. */ -#ifndef DIGITAL_UNIX_COMPATIBLE - justify_left = 1; min_field_width = 0; /* reset flags */ -#endif -#if defined(PERL_COMPATIBLE) || defined(LINUX_COMPATIBLE) - /* keep the entire format string unchanged */ - str_arg = starting_p; str_arg_l = p - starting_p; - /* well, not exactly so for Linux, which does something inbetween, - * and I don't feel an urge to imitate it: "%+++++hy" -> "%+y" */ -#else - /* discard the unrecognized conversion, just keep * - * the unrecognized conversion character */ - str_arg = p; str_arg_l = 0; -#endif - if (*p) str_arg_l++; /* include invalid conversion specifier unchanged - if not at end-of-string */ - break; - } - if (*p) p++; /* step over the just processed conversion specifier */ - /* insert padding to the left as requested by min_field_width; - this does not include the zero padding in case of numerical conversions*/ - if (!justify_left) { /* left padding with blank or zero */ - int n = min_field_width - (str_arg_l+number_of_zeros_to_pad); - if (n > 0) { - if (str_l < str_m) { - size_t avail = str_m-str_l; - fast_memset(str+str_l, (zero_padding?'0':' '), (n>avail?avail:n)); - } - str_l += n; - } - } - /* zero padding as requested by the precision or by the minimal field width - * for numeric conversions required? */ - if (number_of_zeros_to_pad <= 0) { - /* will not copy first part of numeric right now, * - * force it to be copied later in its entirety */ - zero_padding_insertion_ind = 0; - } else { - /* insert first part of numerics (sign or '0x') before zero padding */ - int n = zero_padding_insertion_ind; - if (n > 0) { - if (str_l < str_m) { - size_t avail = str_m-str_l; - fast_memcpy(str+str_l, str_arg, (n>avail?avail:n)); - } - str_l += n; - } - /* insert zero padding as requested by the precision or min field width */ - n = number_of_zeros_to_pad; - if (n > 0) { - if (str_l < str_m) { - size_t avail = str_m-str_l; - fast_memset(str+str_l, '0', (n>avail?avail:n)); - } - str_l += n; - } - } - /* insert formatted string - * (or as-is conversion specifier for unknown conversions) */ - { int n = str_arg_l - zero_padding_insertion_ind; - if (n > 0) { - if (str_l < str_m) { - size_t avail = str_m-str_l; - fast_memcpy(str+str_l, str_arg+zero_padding_insertion_ind, - (n>avail?avail:n)); - } - str_l += n; - } - } - /* insert right padding */ - if (justify_left) { /* right blank padding to the field width */ - int n = min_field_width - (str_arg_l+number_of_zeros_to_pad); - if (n > 0) { - if (str_l < str_m) { - size_t avail = str_m-str_l; - fast_memset(str+str_l, ' ', (n>avail?avail:n)); - } - str_l += n; - } - } - } - } -#if defined(NEED_SNPRINTF_ONLY) - va_end(ap); -#endif - if (str_m > 0) { /* make sure the string is null-terminated - even at the expense of overwriting the last character - (shouldn't happen, but just in case) */ - str[str_l <= str_m-1 ? str_l : str_m-1] = '\0'; - } - /* Return the number of characters formatted (excluding trailing null - * character), that is, the number of characters that would have been - * written to the buffer if it were large enough. - * - * The value of str_l should be returned, but str_l is of unsigned type - * size_t, and snprintf is int, possibly leading to an undetected - * integer overflow, resulting in a negative return value, which is illegal. - * Both XSH5 and ISO C99 (at least the draft) are silent on this issue. - * Should errno be set to EOVERFLOW and EOF returned in this case??? - */ - return (int) str_l; +int +rpl_asprintf(va_alist) va_dcl +#endif /* HAVE_STDARG_H */ +{ +#if !HAVE_STDARG_H + char **ret; + char *format; +#endif /* HAVE_STDARG_H */ + va_list ap; + int len; + + VA_START(ap, format); + VA_SHIFT(ap, ret, char **); + VA_SHIFT(ap, format, const char *); + len = vasprintf(ret, format, ap); + va_end(ap); + return len; } -#endif +#endif /* !HAVE_ASPRINTF */ +#else /* Dummy declaration to avoid empty translation unit warnings. */ +int main(void); +#endif /* !HAVE_SNPRINTF || !HAVE_VSNPRINTF || !HAVE_ASPRINTF || [...] */ + +#if TEST_SNPRINTF +int +main(void) +{ + const char *float_fmt[] = { + /* "%E" and "%e" formats. */ +#if HAVE_LONG_LONG_INT && !OS_BSD && !OS_IRIX + "%.16e", + "%22.16e", + "%022.16e", + "%-22.16e", + "%#+'022.16e", +#endif /* HAVE_LONG_LONG_INT && !OS_BSD && !OS_IRIX */ + "foo|%#+0123.9E|bar", + "%-123.9e", + "%123.9e", + "%+23.9e", + "%+05.8e", + "%-05.8e", + "%05.8e", + "%+5.8e", + "%-5.8e", + "% 5.8e", + "%5.8e", + "%+4.9e", +#if !OS_LINUX /* glibc sometimes gets these wrong. */ + "%+#010.0e", + "%#10.1e", + "%10.5e", + "% 10.5e", + "%5.0e", + "%5.e", + "%#5.0e", + "%#5.e", + "%3.2e", + "%3.1e", + "%-1.5e", + "%1.5e", + "%01.3e", + "%1.e", + "%.1e", + "%#.0e", + "%+.0e", + "% .0e", + "%.0e", + "%#.e", + "%+.e", + "% .e", + "%.e", + "%4e", + "%e", + "%E", +#endif /* !OS_LINUX */ + /* "%F" and "%f" formats. */ +#if !OS_BSD && !OS_IRIX + "% '022f", + "%+'022f", + "%-'22f", + "%'22f", +#if HAVE_LONG_LONG_INT + "%.16f", + "%22.16f", + "%022.16f", + "%-22.16f", + "%#+'022.16f", +#endif /* HAVE_LONG_LONG_INT */ +#endif /* !OS_BSD && !OS_IRIX */ + "foo|%#+0123.9F|bar", + "%-123.9f", + "%123.9f", + "%+23.9f", + "%+#010.0f", + "%#10.1f", + "%10.5f", + "% 10.5f", + "%+05.8f", + "%-05.8f", + "%05.8f", + "%+5.8f", + "%-5.8f", + "% 5.8f", + "%5.8f", + "%5.0f", + "%5.f", + "%#5.0f", + "%#5.f", + "%+4.9f", + "%3.2f", + "%3.1f", + "%-1.5f", + "%1.5f", + "%01.3f", + "%1.f", + "%.1f", + "%#.0f", + "%+.0f", + "% .0f", + "%.0f", + "%#.f", + "%+.f", + "% .f", + "%.f", + "%4f", + "%f", + "%F", + /* "%G" and "%g" formats. */ +#if !OS_BSD && !OS_IRIX && !OS_LINUX + "% '022g", + "%+'022g", + "%-'22g", + "%'22g", +#if HAVE_LONG_LONG_INT + "%.16g", + "%22.16g", + "%022.16g", + "%-22.16g", + "%#+'022.16g", +#endif /* HAVE_LONG_LONG_INT */ +#endif /* !OS_BSD && !OS_IRIX && !OS_LINUX */ + "foo|%#+0123.9G|bar", + "%-123.9g", + "%123.9g", + "%+23.9g", + "%+05.8g", + "%-05.8g", + "%05.8g", + "%+5.8g", + "%-5.8g", + "% 5.8g", + "%5.8g", + "%+4.9g", +#if !OS_LINUX /* glibc sometimes gets these wrong. */ + "%+#010.0g", + "%#10.1g", + "%10.5g", + "% 10.5g", + "%5.0g", + "%5.g", + "%#5.0g", + "%#5.g", + "%3.2g", + "%3.1g", + "%-1.5g", + "%1.5g", + "%01.3g", + "%1.g", + "%.1g", + "%#.0g", + "%+.0g", + "% .0g", + "%.0g", + "%#.g", + "%+.g", + "% .g", + "%.g", + "%4g", + "%g", + "%G", +#endif /* !OS_LINUX */ + NULL + }; + double float_val[] = { + -4.136, + -134.52, + -5.04030201, + -3410.01234, + -999999.999999, + -913450.29876, + -913450.2, + -91345.2, + -9134.2, + -913.2, + -91.2, + -9.2, + -9.9, + 4.136, + 134.52, + 5.04030201, + 3410.01234, + 999999.999999, + 913450.29876, + 913450.2, + 91345.2, + 9134.2, + 913.2, + 91.2, + 9.2, + 9.9, + 9.96, + 9.996, + 9.9996, + 9.99996, + 9.999996, + 9.9999996, + 9.99999996, + 0.99999996, + 0.99999999, + 0.09999999, + 0.00999999, + 0.00099999, + 0.00009999, + 0.00000999, + 0.00000099, + 0.00000009, + 0.00000001, + 0.0000001, + 0.000001, + 0.00001, + 0.0001, + 0.001, + 0.01, + 0.1, + 1.0, + 1.5, + -1.5, + -1.0, + -0.1, +#if !OS_BSD /* BSD sometimes gets these wrong. */ +#ifdef INFINITY + INFINITY, + -INFINITY, +#endif /* defined(INFINITY) */ +#ifdef NAN + NAN, +#endif /* defined(NAN) */ +#endif /* !OS_BSD */ + 0 + }; + const char *long_fmt[] = { + "foo|%0123ld|bar", +#if !OS_IRIX + "% '0123ld", + "%+'0123ld", + "%-'123ld", + "%'123ld", +#endif /* !OS_IRiX */ + "%123.9ld", + "% 123.9ld", + "%+123.9ld", + "%-123.9ld", + "%0123ld", + "% 0123ld", + "%+0123ld", + "%-0123ld", + "%10.5ld", + "% 10.5ld", + "%+10.5ld", + "%-10.5ld", + "%010ld", + "% 010ld", + "%+010ld", + "%-010ld", + "%4.2ld", + "% 4.2ld", + "%+4.2ld", + "%-4.2ld", + "%04ld", + "% 04ld", + "%+04ld", + "%-04ld", + "%5.5ld", + "%+22.33ld", + "%01.3ld", + "%1.5ld", + "%-1.5ld", + "%44ld", + "%4ld", + "%4.0ld", + "%4.ld", + "%.44ld", + "%.4ld", + "%.0ld", + "%.ld", + "%ld", + NULL + }; + long int long_val[] = { +#ifdef LONG_MAX + LONG_MAX, +#endif /* LONG_MAX */ +#ifdef LONG_MIN + LONG_MIN, +#endif /* LONG_MIN */ + -91340, + 91340, + 341, + 134, + 0203, + -1, + 1, + 0 + }; + const char *ulong_fmt[] = { + /* "%u" formats. */ + "foo|%0123lu|bar", +#if !OS_IRIX + "% '0123lu", + "%+'0123lu", + "%-'123lu", + "%'123lu", +#endif /* !OS_IRiX */ + "%123.9lu", + "% 123.9lu", + "%+123.9lu", + "%-123.9lu", + "%0123lu", + "% 0123lu", + "%+0123lu", + "%-0123lu", + "%5.5lu", + "%+22.33lu", + "%01.3lu", + "%1.5lu", + "%-1.5lu", + "%44lu", + "%lu", + /* "%o" formats. */ + "foo|%#0123lo|bar", + "%#123.9lo", + "%# 123.9lo", + "%#+123.9lo", + "%#-123.9lo", + "%#0123lo", + "%# 0123lo", + "%#+0123lo", + "%#-0123lo", + "%#5.5lo", + "%#+22.33lo", + "%#01.3lo", + "%#1.5lo", + "%#-1.5lo", + "%#44lo", + "%#lo", + "%123.9lo", + "% 123.9lo", + "%+123.9lo", + "%-123.9lo", + "%0123lo", + "% 0123lo", + "%+0123lo", + "%-0123lo", + "%5.5lo", + "%+22.33lo", + "%01.3lo", + "%1.5lo", + "%-1.5lo", + "%44lo", + "%lo", + /* "%X" and "%x" formats. */ + "foo|%#0123lX|bar", + "%#123.9lx", + "%# 123.9lx", + "%#+123.9lx", + "%#-123.9lx", + "%#0123lx", + "%# 0123lx", + "%#+0123lx", + "%#-0123lx", + "%#5.5lx", + "%#+22.33lx", + "%#01.3lx", + "%#1.5lx", + "%#-1.5lx", + "%#44lx", + "%#lx", + "%#lX", + "%123.9lx", + "% 123.9lx", + "%+123.9lx", + "%-123.9lx", + "%0123lx", + "% 0123lx", + "%+0123lx", + "%-0123lx", + "%5.5lx", + "%+22.33lx", + "%01.3lx", + "%1.5lx", + "%-1.5lx", + "%44lx", + "%lx", + "%lX", + NULL + }; + unsigned long int ulong_val[] = { +#ifdef ULONG_MAX + ULONG_MAX, +#endif /* ULONG_MAX */ + 91340, + 341, + 134, + 0203, + 1, + 0 + }; + const char *llong_fmt[] = { + "foo|%0123lld|bar", + "%123.9lld", + "% 123.9lld", + "%+123.9lld", + "%-123.9lld", + "%0123lld", + "% 0123lld", + "%+0123lld", + "%-0123lld", + "%5.5lld", + "%+22.33lld", + "%01.3lld", + "%1.5lld", + "%-1.5lld", + "%44lld", + "%lld", + NULL + }; + LLONG llong_val[] = { +#ifdef LLONG_MAX + LLONG_MAX, +#endif /* LLONG_MAX */ +#ifdef LLONG_MIN + LLONG_MIN, +#endif /* LLONG_MIN */ + -91340, + 91340, + 341, + 134, + 0203, + -1, + 1, + 0 + }; + const char *string_fmt[] = { + "foo|%10.10s|bar", + "%-10.10s", + "%10.10s", + "%10.5s", + "%5.10s", + "%10.1s", + "%1.10s", + "%10.0s", + "%0.10s", + "%-42.5s", + "%2.s", + "%.10s", + "%.1s", + "%.0s", + "%.s", + "%4s", + "%s", + NULL + }; + const char *string_val[] = { + "Hello", + "Hello, world!", + "Sound check: One, two, three.", + "This string is a little longer than the other strings.", + "1", + "", + NULL + }; +#if !OS_SYSV /* SysV uses a different format than we do. */ + const char *pointer_fmt[] = { + "foo|%p|bar", + "%42p", + "%p", + NULL + }; + const char *pointer_val[] = { + *pointer_fmt, + *string_fmt, + *string_val, + NULL + }; +#endif /* !OS_SYSV */ + char buf1[1024], buf2[1024]; + double value, digits = 9.123456789012345678901234567890123456789; + int i, j, r1, r2, failed = 0, num = 0; + +/* + * Use -DTEST_NILS in order to also test the conversion of nil values. Might + * segfault on systems which don't support converting a NULL pointer with "%s" + * and lets some test cases fail against BSD and glibc due to bugs in their + * implementations. + */ +#ifndef TEST_NILS +#define TEST_NILS 0 +#elif TEST_NILS +#undef TEST_NILS +#define TEST_NILS 1 +#endif /* !defined(TEST_NILS) */ +#ifdef TEST +#undef TEST +#endif /* defined(TEST) */ +#define TEST(fmt, val) \ +do { \ + for (i = 0; fmt[i] != NULL; i++) \ + for (j = 0; j == 0 || val[j - TEST_NILS] != 0; j++) { \ + r1 = sprintf(buf1, fmt[i], val[j]); \ + r2 = snprintf(buf2, sizeof(buf2), fmt[i], val[j]); \ + if (strcmp(buf1, buf2) != 0 || r1 != r2) { \ + (void)printf("Results don't match, " \ + "format string: %s\n" \ + "\t sprintf(3): [%s] (%d)\n" \ + "\tsnprintf(3): [%s] (%d)\n", \ + fmt[i], buf1, r1, buf2, r2); \ + failed++; \ + } \ + num++; \ + } \ +} while (/* CONSTCOND */ 0) + +#if HAVE_LOCALE_H + (void)setlocale(LC_ALL, ""); +#endif /* HAVE_LOCALE_H */ + + (void)puts("Testing our snprintf(3) against your system's sprintf(3)."); + TEST(float_fmt, float_val); + TEST(long_fmt, long_val); + TEST(ulong_fmt, ulong_val); + TEST(llong_fmt, llong_val); + TEST(string_fmt, string_val); +#if !OS_SYSV /* SysV uses a different format than we do. */ + TEST(pointer_fmt, pointer_val); +#endif /* !OS_SYSV */ + (void)printf("Result: %d out of %d tests failed.\n", failed, num); + + (void)fputs("Checking how many digits we support: ", stdout); + for (i = 0; i < 100; i++) { + value = pow(10, i) * digits; + (void)sprintf(buf1, "%.1f", value); + (void)snprintf(buf2, sizeof(buf2), "%.1f", value); + if (strcmp(buf1, buf2) != 0) { + (void)printf("apparently %d.\n", i); + break; + } + } + return (failed == 0) ? 0 : 1; +} +#endif /* TEST_SNPRINTF */ + +/* vim: set joinspaces textwidth=80: */ Modified: csw/mgar/pkg/watch/trunk/files/snprintf.h =================================================================== --- csw/mgar/pkg/watch/trunk/files/snprintf.h 2009-03-04 21:54:05 UTC (rev 3586) +++ csw/mgar/pkg/watch/trunk/files/snprintf.h 2009-03-04 22:52:35 UTC (rev 3587) @@ -1,26 +1,29 @@ -#ifndef _PORTABLE_SNPRINTF_H_ -#define _PORTABLE_SNPRINTF_H_ +/* $Id: system.h,v 1.1.1.1 2008/01/06 03:24:00 holger Exp $ */ -#define PORTABLE_SNPRINTF_VERSION_MAJOR 2 -#define PORTABLE_SNPRINTF_VERSION_MINOR 2 +#ifndef SYSTEM_H +#define SYSTEM_H -#ifdef HAVE_SNPRINTF -#include -#else -extern int snprintf(char *, size_t, const char *, /*args*/ ...); -extern int vsnprintf(char *, size_t, const char *, va_list); -#endif +#if HAVE_CONFIG_H +#include +#endif /* HAVE_CONFIG_H */ -#if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF) -extern int portable_snprintf(char *str, size_t str_m, const char *fmt, /*args*/ ...); -extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap); -#define snprintf portable_snprintf -#define vsnprintf portable_vsnprintf -#endif - -extern int asprintf (char **ptr, const char *fmt, /*args*/ ...); -extern int vasprintf (char **ptr, const char *fmt, va_list ap); -extern int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...); -extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap); - -#endif +#if HAVE_STDARG_H +#include +#if !HAVE_VSNPRINTF +int rpl_vsnprintf(char *, size_t, const char *, va_list); +#define vsnprintf rpl_vsnprintf +#endif /* !HAVE_VSNPRINTF */ +#if !HAVE_SNPRINTF +int rpl_snprintf(char *, size_t, const char *, ...); @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Mar 5 03:56:34 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 05 Mar 2009 02:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3588] csw/mgar/pkg Message-ID: Revision: 3588 http://gar.svn.sourceforge.net/gar/?rev=3588&view=rev Author: valholla Date: 2009-03-05 02:56:34 +0000 (Thu, 05 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/gnupg_minimal/ csw/mgar/pkg/gnupg_minimal/trunk/ csw/mgar/pkg/gnupg_minimal/trunk/Makefile csw/mgar/pkg/gnupg_minimal/trunk/checksums csw/mgar/pkg/gnupg_minimal/trunk/files/ Property changes on: csw/mgar/pkg/gnupg_minimal/trunk ___________________________________________________________________ Added: svn:externals + Added: csw/mgar/pkg/gnupg_minimal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg_minimal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnupg_minimal/trunk/Makefile 2009-03-05 02:56:34 UTC (rev 3588) @@ -0,0 +1,76 @@ +GARNAME = gnupg +GARVERSION = 1.4.9 +CATEGORIES = apps + +DESCRIPTION = GnuPG without keyserver access and optional algorithms, except RSA (enable-minimal configure) +define BLURB + RFC 2440 compliant tool for secure communication and data storage +endef + +PACKAGES = CSWgnupgminimal +CATALOGNAME = gnupg_minimal +SPKG_DESC = $(DESCRIPTION) + +SPKG_SOURCEURL = http://www.gnupg.org/ +MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +BUILD64 = 1 +NO_ISAEXEC = 0 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-suffix=-minimal +CONFIGURE_ARGS += --with-libcurl=$(prefix) +CONFIGURE_ARGS += --with-ldap=$(prefix) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-bzip2=$(prefix) +CONFIGURE_ARGS += --with-tar=$(prefix) +CONFIGURE_ARGS += --with-readline=$(prefix) +CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) +CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) +CONFIGURE_ARGS += --with-included-regex +CONFIGURE_ARGS += --enable-threads=solaris +CONFIGURE_ARGS += --enable-shared=no +CONFIGURE_ARGS += --disable-asm +CONFIGURE_ARGS += --disable-gnupg-iconv +CONFIGURE_ARGS += --disable-card-support +CONFIGURE_ARGS += --disable-agent-support +CONFIGURE_ARGS += --disable-idea +CONFIGURE_ARGS += --disable-cast5 +CONFIGURE_ARGS += --disable-blowfish +CONFIGURE_ARGS += --disable-aes +CONFIGURE_ARGS += --disable-twofish +CONFIGURE_ARGS += --disable-sha256 +CONFIGURE_ARGS += --disable-sha512 +CONFIGURE_ARGS += --disable-bzip2 +CONFIGURE_ARGS += --disable-exec +CONFIGURE_ARGS += --disable-photo-viewers +CONFIGURE_ARGS += --disable-keyserver-helpers +CONFIGURE_ARGS += --disable-ldap +CONFIGURE_ARGS += --disable-hkp +CONFIGURE_ARGS += --disable-finger +CONFIGURE_ARGS += --disable-generic +CONFIGURE_ARGS += --disable-keyserver-path +CONFIGURE_ARGS += --disable-dns-srv +CONFIGURE_ARGS += --disable-dns-pka +CONFIGURE_ARGS += --disable-dns-cert + +REQUIRED_PKGS_CSWgnupg = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWgnupg += CSWoldaprt CSWreadline CSWzlib + +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-minimal +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsplit-minimal +ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgv-minimal + +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-minimal +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsplit-minimal +MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgv-minimal + + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/gnupg_minimal/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg_minimal/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnupg_minimal/trunk/checksums 2009-03-05 02:56:34 UTC (rev 3588) @@ -0,0 +1 @@ +cc52393087480ac8d245625004a6a30c download/gnupg-1.4.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Mar 5 20:40:32 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 05 Mar 2009 19:40:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3589] csw/mgar/pkg Message-ID: Revision: 3589 http://gar.svn.sourceforge.net/gar/?rev=3589&view=rev Author: idogan23 Date: 2009-03-05 19:40:32 +0000 (Thu, 05 Mar 2009) Log Message: ----------- unbound: initial commit Added Paths: ----------- csw/mgar/pkg/unbound/ csw/mgar/pkg/unbound/branches/ csw/mgar/pkg/unbound/tags/ csw/mgar/pkg/unbound/trunk/ csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/files/ Property changes on: csw/mgar/pkg/unbound/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-03-05 19:40:32 UTC (rev 3589) @@ -0,0 +1,30 @@ +GARNAME = unbound +GARVERSION = 1.2.1 +CATEGORIES = server + +DESCRIPTION = A validating, recursive, and caching DNS resolver +define BLUR + Unbound is designed as a set of modular components, so that also + DNSSEC (secure DNS) validation and stub-resolvers (that do not run as + a server, but are linked into an application) are easily possible. +endef + +MASTER_SITES = http://unbound.net/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWunbound,) + +GARCOMPILER = GCC4 + +# We define upstream file regex so we can be notifed of new upstream software release +#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-pthreads +CONFIGUTE_ARGS += --with-solaris-threads +CONFIGURE_ARGS += --with-ssl=/opt/csw + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Mar 5 20:41:28 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 05 Mar 2009 19:41:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[3590] csw/mgar/pkg/unbound/trunk/files/CSWunbound.gspec Message-ID: Revision: 3590 http://gar.svn.sourceforge.net/gar/?rev=3590&view=rev Author: idogan23 Date: 2009-03-05 19:41:28 +0000 (Thu, 05 Mar 2009) Log Message: ----------- unbound: forgot to add gspec Added Paths: ----------- csw/mgar/pkg/unbound/trunk/files/CSWunbound.gspec Added: csw/mgar/pkg/unbound/trunk/files/CSWunbound.gspec =================================================================== --- csw/mgar/pkg/unbound/trunk/files/CSWunbound.gspec (rev 0) +++ csw/mgar/pkg/unbound/trunk/files/CSWunbound.gspec 2009-03-05 19:41:28 UTC (rev 3590) @@ -0,0 +1,4 @@ +%var bitname unbound +%var pkgname CSWunbound +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 5 21:36:19 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 05 Mar 2009 20:36:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[3591] csw/mgar/pkg/git/trunk Message-ID: Revision: 3591 http://gar.svn.sourceforge.net/gar/?rev=3591&view=rev Author: bdwalton Date: 2009-03-05 20:36:19 +0000 (Thu, 05 Mar 2009) Log Message: ----------- Bump to 1.6.2 Remove patches since they're incorporated upstrea. Switch to tracking Git repo instead of static tarballs. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch csw/mgar/pkg/git/trunk/files/CSWgit.gspec csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec csw/mgar/pkg/git/trunk/files/CSWgitk.gspec csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/Makefile 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.1.3 +GARVERSION = 1.6.2 CATEGORIES = devel PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc @@ -52,11 +52,11 @@ SPKG_DESC_CSWgitcvs = Git tools for working with CVS repositories SPKG_DESC_CSWgitdoc = Documentation for Git -MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +GIT_USE_PROXY = 1 +GIT_REPOS = git://git.kernel.org/pub/scm/git/git.git +GIT_TREEISH_git.git = v$(GARVERSION) PATCHFILES = doc-makefile.patch -PATCHFILES += 0001-git-svn-fix-to-avoid-using-strftime-z.patch PKGFILES_CSWgitsvn = .*svn.* PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* @@ -65,7 +65,8 @@ PKGFILES_CSWgitcvs = .*cvs.* PKGFILES_CSWgitdoc = $(PKGFILES_DOC) -# We define upstream file regex so we can be notifed of new upstream software release +# We define upstream file regex so we can be notifed of new upstream +# software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU @@ -84,13 +85,17 @@ include gar/category.mk -# override path so we use the local modifications to checkpkg. -PATH := /home/bwalton:$(PATH) - # for tail -n and to override things like, etc with the gnu counterparts # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) +# git doesn't track the configure file, it needs to be built when using +# source right from the repo. +pre-configure-modulated: + @(cd $(WORKSRC); echo $(GARVERSION) > version; \ + $(MAKE) configure ) + @$(MAKECOOKIE) + # force the elisp extension to be built too. post-build-modulated: @echo Builing Emacs Git extension Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/checksums 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,3 +1,3 @@ -e31ea5ce9b076f5745056f01465e9602 download/git-1.6.1.3.tar.bz2 075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch 97290254ce2e9e6c37fdd824140fda85 download/0001-git-svn-fix-to-avoid-using-strftime-z.patch +1081a8ca474317f1963e0d1ee69832de download/0002-git-svn-return-original-format_svn_date-semantics.patch Deleted: csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,41 +0,0 @@ -From 48fcd6ae6c41779336242bb4cd00b3050b7bf6e2 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Tue, 24 Feb 2009 12:31:39 -0500 -Subject: [PATCH] git-svn fix to avoid using strftime %z - -%z isn't available on all platforms in the date formatting -routines. Provide a workalike capability that should be -more portable. ---- - git-svn.perl | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/git-svn.perl b/git-svn.perl -index cbc5211..24180eb 100755 ---- a/git-svn.perl -+++ b/git-svn.perl -@@ -4615,6 +4615,7 @@ package Git::SVN::Log; - use strict; - use warnings; - use POSIX qw/strftime/; -+use Time::Local; - use constant commit_log_separator => ('-' x 72) . "\n"; - use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline - %rusers $show_commit $incremental/; -@@ -4721,7 +4722,12 @@ sub run_pager { - } - - sub format_svn_date { -- return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift)); -+ # some systmes don't handle or mishandle %z, so be creative. -+ my $t = shift; -+ my $gm = timelocal(gmtime($t)); -+ my $sign = qw( + + - )[ $t <=> $gm ]; -+ my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]); -+ return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t)); - } - - sub parse_git_date { --- -1.6.0.4 - Deleted: csw/mgar/pkg/git/trunk/files/CSWgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,4 +0,0 @@ -%var bitname git -%var pkgname CSWgit -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,5 +0,0 @@ -%var bitname git_cvs -%var pkgname CSWgitcvs -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,5 +0,0 @@ -%var bitname git_doc -%var pkgname CSWgitdoc -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,6 +0,0 @@ -%var bitname git_emacs -%var pkgname CSWgitemacs -%var desc A Git VCS mode for Emacs -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,5 +0,0 @@ -%var bitname git_gui -%var pkgname CSWgitgui -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWgitk.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,5 +0,0 @@ -%var bitname gitk -%var pkgname CSWgitk -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2009-03-05 19:41:28 UTC (rev 3590) +++ csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2009-03-05 20:36:19 UTC (rev 3591) @@ -1,5 +0,0 @@ -%var bitname git_svn -%var pkgname CSWgitsvn -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Mar 5 22:02:00 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 05 Mar 2009 21:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[3592] csw/mgar/pkg/mairix/trunk Message-ID: Revision: 3592 http://gar.svn.sourceforge.net/gar/?rev=3592&view=rev Author: skayser Date: 2009-03-05 21:02:00 +0000 (Thu, 05 Mar 2009) Log Message: ----------- mairix: dropped extra HMS support for now, need some spare time for that Modified Paths: -------------- csw/mgar/pkg/mairix/trunk/Makefile csw/mgar/pkg/mairix/trunk/checksums csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff Modified: csw/mgar/pkg/mairix/trunk/Makefile =================================================================== --- csw/mgar/pkg/mairix/trunk/Makefile 2009-03-05 20:36:19 UTC (rev 3591) +++ csw/mgar/pkg/mairix/trunk/Makefile 2009-03-05 21:02:00 UTC (rev 3592) @@ -25,8 +25,7 @@ TEST_SCRIPTS = -# Mention option -x in the help message (-h) and provide fine grained -# timestamps (still needs a patch to rfc822.c, where HMS are dropped) +# Mention option -x in the help message (-h) PATCHFILES = patch-excerpt.diff # configure doesn't understand most of the $(DIRPATHS) arguments Modified: csw/mgar/pkg/mairix/trunk/checksums =================================================================== --- csw/mgar/pkg/mairix/trunk/checksums 2009-03-05 20:36:19 UTC (rev 3591) +++ csw/mgar/pkg/mairix/trunk/checksums 2009-03-05 21:02:00 UTC (rev 3592) @@ -1,2 +1,2 @@ 821619895931711c370f51f3442a0ded download/mairix-0.21.tar.gz -e14ad9070d252bd7bb2ddef19915c145 download/patch-excerpt.diff +a8f4dce18bc0562a85c0cc2ae2dd6f41 download/patch-excerpt.diff Modified: csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff =================================================================== --- csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff 2009-03-05 20:36:19 UTC (rev 3591) +++ csw/mgar/pkg/mairix/trunk/files/patch-excerpt.diff 2009-03-05 21:02:00 UTC (rev 3592) @@ -9,15 +9,3 @@ "expr_i : search expression (all expr's AND'ed together):\n" " word : match word in message body and major headers\n" " t:word : match word in To: header\n" -diff -ur mairix-0.21.org/search.c mairix-0.21/search.c ---- mairix-0.21.org/search.c 2007-06-22 21:18:00.000000000 +0100 -+++ mairix-0.21/search.c 2009-03-03 14:19:30.048952226 +0000 -@@ -1208,7 +1208,7 @@ - if (parsed->hdrs.from) printf(" From: %s\n", parsed->hdrs.from); - if (parsed->hdrs.subject) printf(" Subject: %s\n", parsed->hdrs.subject); - thetm = gmtime(&parsed->hdrs.date); -- strftime(datebuf, sizeof(datebuf), "%a, %d %b %Y", thetm); -+ strftime(datebuf, sizeof(datebuf), "%a, %d %b %Y, %H:%M:%S", thetm); - printf(" Date: %s\n", datebuf); - free_rfc822(parsed); - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Mar 5 23:09:01 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 05 Mar 2009 22:09:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3593] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 3593 http://gar.svn.sourceforge.net/gar/?rev=3593&view=rev Author: idogan23 Date: 2009-03-05 22:09:01 +0000 (Thu, 05 Mar 2009) Log Message: ----------- unbound: added preinstall script, changed pid file location Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-03-05 21:02:00 UTC (rev 3592) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-03-05 22:09:01 UTC (rev 3593) @@ -11,7 +11,7 @@ MASTER_SITES = http://unbound.net/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWunbound,) +DISTFILES += $(call admfiles,CSWunbound, preinstall) GARCOMPILER = GCC4 @@ -26,5 +26,6 @@ CONFIGURE_ARGS += --without-pthreads CONFIGUTE_ARGS += --with-solaris-threads CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid include gar/category.mk Added: csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall =================================================================== --- csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall (rev 0) +++ csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall 2009-03-05 22:09:01 UTC (rev 3593) @@ -0,0 +1,18 @@ +#!/bin/sh + +# check, if the unbound user does exist +grep '^unbound:' $PKG_ROOT_DIR/etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd unbound >/dev/null + if [ $? -ne 0 ] ; then + NEEDUSER=1 + fi +fi + +# create the unbound user, if NEEDUSER=1 +if [ "$NEEDUSER" = 1 ] ; then + echo Adding required unbound user + + # create the amavis user + /usr/sbin/useradd -d /var/run -g other -c 'unbound pseud user' -s /bin/false unbound +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:19:38 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:19:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3594] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 3594 http://gar.svn.sourceforge.net/gar/?rev=3594&view=rev Author: hson Date: 2009-03-05 23:19:35 +0000 (Thu, 05 Mar 2009) Log Message: ----------- ilmbase: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2009-03-05 22:09:01 UTC (rev 3593) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2009-03-05 23:19:35 UTC (rev 3594) @@ -34,7 +34,7 @@ LICENSE = LICENSE # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:20:23 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:20:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[3595] csw/mgar/pkg/libexif/trunk/Makefile Message-ID: Revision: 3595 http://gar.svn.sourceforge.net/gar/?rev=3595&view=rev Author: hson Date: 2009-03-05 23:20:23 +0000 (Thu, 05 Mar 2009) Log Message: ----------- libexif: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/libexif/trunk/Makefile Modified: csw/mgar/pkg/libexif/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexif/trunk/Makefile 2009-03-05 23:19:35 UTC (rev 3594) +++ csw/mgar/pkg/libexif/trunk/Makefile 2009-03-05 23:20:23 UTC (rev 3595) @@ -19,7 +19,9 @@ REQUIRED_PKGS += CSWggettextrt # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12272 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:23:01 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:23:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3596] csw/mgar/pkg/exiftool/trunk/Makefile Message-ID: Revision: 3596 http://gar.svn.sourceforge.net/gar/?rev=3596&view=rev Author: hson Date: 2009-03-05 23:23:01 +0000 (Thu, 05 Mar 2009) Log Message: ----------- exiftool: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-03-05 23:20:23 UTC (rev 3595) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-03-05 23:23:01 UTC (rev 3596) @@ -18,7 +18,7 @@ REQUIRED_PKGS += CSWperl CSWpmcompresszlib # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = Image-ExifTool-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:23:06 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:23:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3597] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 3597 http://gar.svn.sourceforge.net/gar/?rev=3597&view=rev Author: hson Date: 2009-03-05 23:23:06 +0000 (Thu, 05 Mar 2009) Log Message: ----------- imagemagick: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-03-05 23:23:01 UTC (rev 3596) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-03-05 23:23:06 UTC (rev 3597) @@ -33,7 +33,7 @@ REQUIRED_PKGS += CSWsunmath CSWtiff CSWwmf CSWzlib # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-(\d+).tar.bz2 +UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:28:50 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:28:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[3598] csw/mgar/pkg/lcms/trunk/Makefile Message-ID: Revision: 3598 http://gar.svn.sourceforge.net/gar/?rev=3598&view=rev Author: hson Date: 2009-03-05 23:28:47 +0000 (Thu, 05 Mar 2009) Log Message: ----------- lcms: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2009-03-05 23:23:06 UTC (rev 3597) +++ csw/mgar/pkg/lcms/trunk/Makefile 2009-03-05 23:28:47 UTC (rev 3598) @@ -23,7 +23,9 @@ LICENSE = COPYING # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=26279 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:32:41 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:32:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[3599] csw/mgar/pkg/libiptcdata/trunk/Makefile Message-ID: Revision: 3599 http://gar.svn.sourceforge.net/gar/?rev=3599&view=rev Author: hson Date: 2009-03-05 23:32:41 +0000 (Thu, 05 Mar 2009) Log Message: ----------- libiptcdata: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/libiptcdata/trunk/Makefile Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiptcdata/trunk/Makefile 2009-03-05 23:28:47 UTC (rev 3598) +++ csw/mgar/pkg/libiptcdata/trunk/Makefile 2009-03-05 23:32:41 UTC (rev 3599) @@ -10,7 +10,7 @@ viewing, modifying, and saving this metadata. endef -MASTER_SITES += $(SF_MIRRORS) +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz SPKG_SOURCEURL = http://libiptcdata.sourceforge.net @@ -20,7 +20,9 @@ REQUIRED_PKGS = CSWggettextrt CSWiconv # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=130582 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 6 00:47:27 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 05 Mar 2009 23:47:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[3600] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 3600 http://gar.svn.sourceforge.net/gar/?rev=3600&view=rev Author: hson Date: 2009-03-05 23:47:27 +0000 (Thu, 05 Mar 2009) Log Message: ----------- librsvg: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-03-05 23:32:41 UTC (rev 3599) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-03-05 23:47:27 UTC (rev 3600) @@ -35,7 +35,7 @@ REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender CSWorbit2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 6 03:27:11 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 06 Mar 2009 02:27:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[3601] csw/mgar/pkg/gnupg Message-ID: Revision: 3601 http://gar.svn.sourceforge.net/gar/?rev=3601&view=rev Author: valholla Date: 2009-03-06 02:27:11 +0000 (Fri, 06 Mar 2009) Log Message: ----------- working copys Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg_minimal/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnupg_minimal/Makefile csw/mgar/pkg/gnupg_minimal/branches/ csw/mgar/pkg/gnupg_minimal/tags/ Property Changed: ---------------- csw/mgar/pkg/gnupg_minimal/trunk/ Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2009-03-05 23:47:27 UTC (rev 3600) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2009-03-06 02:27:11 UTC (rev 3601) @@ -20,51 +20,23 @@ UFILES_REGEX = (\d+(?:\.\d+)*) BUILD64 = 1 -NO_ISAEXEC = 0 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libcurl -CONFIGURE_ARGS += --with-ldap -CONFIGURE_ARGS += --with-zlib -CONFIGURE_ARGS += --with-bzip2 -CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-libcurl=$(prefix) +CONFIGURE_ARGS += --with-ldap=$(prefix) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-bzip2=$(prefix) +CONFIGURE_ARGS += --with-tar=$(prefix) +CONFIGURE_ARGS += --with-readline=$(prefix) +CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) +CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) +CONFIGURE_ARGS += --with-included-regex CONFIGURE_ARGS += --enable-threads=solaris +CONFIGURE_ARGS += --disable-asm -# This is somehow not correctly detected from autoconf -EXTRA_LINKER_FLAGS = -lgpg-error -# Needed for nanosleep() -EXTRA_LINKER_FLAGS += -lrt +REQUIRED_PKGS_CSWgnupg = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWgnupg += CSWoldaprt CSWreadline CSWzlib -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-agent -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-connect-agent -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg2 -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgconf -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgkey2ssh -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgparsemail -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsm -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsm-gencert.sh -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgv2 -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/kbxutil -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/scdaemon -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/watchgnupg - -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-agent -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-connect-agent -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg2 -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgconf -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgkey2ssh -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgparsemail -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsm -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsm-gencert.sh -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgv2 -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/kbxutil -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/scdaemon -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/watchgnupg - -REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt CSWlibassuan -REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn -REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt - TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums 2009-03-05 23:47:27 UTC (rev 3600) +++ csw/mgar/pkg/gnupg/trunk/checksums 2009-03-06 02:27:11 UTC (rev 3601) @@ -0,0 +1 @@ +cc52393087480ac8d245625004a6a30c download/gnupg-1.4.9.tar.bz2 Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-03-05 23:47:27 UTC (rev 3600) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-03-06 02:27:11 UTC (rev 3601) @@ -7,9 +7,9 @@ RFC 2440 compliant tool for secure communication and data storage endef -PACKAGES = CSWgnupg2 -CATALOGNAME = gnupg2 -SPKG_DESC = GnuPG is a complete and free replacement for PGP. +PACKAGES = CSWgnupg2 +CATALOGNAME_CSWgnupg2 = gnupg2 +SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP. SPKG_SOURCEURL = http://www.gnupg.org/ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ @@ -26,7 +26,6 @@ UFILES_REGEX = (\d+(?:\.\d+)*) BUILD64 = 1 -NO_ISAEXEC = 0 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libcurl @@ -41,32 +40,6 @@ # Needed for nanosleep() EXTRA_LINKER_FLAGS += -lrt -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-agent -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-connect-agent -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg2 -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgconf -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgkey2ssh -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgparsemail -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsm -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsm-gencert.sh -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgv2 -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/kbxutil -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/scdaemon -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/watchgnupg - -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-agent -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-connect-agent -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg2 -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgconf -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgkey2ssh -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgparsemail -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsm -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsm-gencert.sh -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgv2 -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/kbxutil -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/scdaemon -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/watchgnupg - REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt CSWlibassuan REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt Added: csw/mgar/pkg/gnupg_minimal/Makefile =================================================================== --- csw/mgar/pkg/gnupg_minimal/Makefile (rev 0) +++ csw/mgar/pkg/gnupg_minimal/Makefile 2009-03-06 02:27:11 UTC (rev 3601) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/gnupg_minimal/trunk ___________________________________________________________________ Modified: svn:externals - + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/gnupg_minimal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg_minimal/trunk/Makefile 2009-03-05 23:47:27 UTC (rev 3600) +++ csw/mgar/pkg/gnupg_minimal/trunk/Makefile 2009-03-06 02:27:11 UTC (rev 3601) @@ -7,21 +7,19 @@ RFC 2440 compliant tool for secure communication and data storage endef -PACKAGES = CSWgnupgminimal -CATALOGNAME = gnupg_minimal -SPKG_DESC = $(DESCRIPTION) - -SPKG_SOURCEURL = http://www.gnupg.org/ -MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - -# We define upstream file regex so we can be notifed of -# new upstream software release +MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = (\d+(?:\.\d+)*) -BUILD64 = 1 -NO_ISAEXEC = 0 +PACKAGES = CSWgnupgminimal +CATALOGNAME_CSWgnupgminimal = gnupg_minimal +SPKG_DESC_CSWgnupgminimal = $(DESCRIPTION) +#PKGFILES_CSWgnupgminimal = .*/bin/.* +REQUIRED_PKGS_CSWgnupgminimal = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWgnupgminimal += CSWoldaprt CSWreadline CSWzlib +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-suffix=-minimal CONFIGURE_ARGS += --with-libcurl=$(prefix) @@ -59,18 +57,7 @@ CONFIGURE_ARGS += --disable-dns-pka CONFIGURE_ARGS += --disable-dns-cert -REQUIRED_PKGS_CSWgnupg = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv -REQUIRED_PKGS_CSWgnupg += CSWoldaprt CSWreadline CSWzlib - -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpg-minimal -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgsplit-minimal -ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/gpgv-minimal - -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpg-minimal -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgsplit-minimal -MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/gpgv-minimal - - TEST_TARGET = check include gar/category.mk + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 6 03:33:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 06 Mar 2009 02:33:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[3602] csw/mgar/pkg/php5/trunk Message-ID: Revision: 3602 http://gar.svn.sourceforge.net/gar/?rev=3602&view=rev Author: valholla Date: 2009-03-06 02:33:08 +0000 (Fri, 06 Mar 2009) Log Message: ----------- added missing package requirements Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/files/odbc.diff csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_recode/files/recode.diff csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile csw/mgar/pkg/php5/trunk/files/config.diff Removed Paths: ------------- csw/mgar/pkg/php5/trunk/extensions/php5_readline/ csw/mgar/pkg/php5/trunk/files/CSWphp5.depend csw/mgar/pkg/php5/trunk/files/CSWphp5.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5_ext.depend csw/mgar/pkg/php5/trunk/files/CSWphp5bz2.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5bz2.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5curl.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5curl.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5dba.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5dba.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5devel.depend csw/mgar/pkg/php5/trunk/files/CSWphp5devel.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5devel.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5ftp.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5ftp.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5gd.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5gd.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5gettext.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5gettext.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5gmp.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5gmp.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5imap.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5imap.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5ldap.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5ldap.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5mcrypt.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5mcrypt.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5mhash.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5mhash.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5mssql.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5mssql.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5mysql.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5mysql.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5mysqli.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5mysqli.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5odbc.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5odbc.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5pdomysql.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5pdomysql.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5pdoodbc.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5pdoodbc.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5pdopgsql.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5pdopgsql.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5pdosqlite.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5pdosqlite.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5pgsql.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5pgsql.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5pspell.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5pspell.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5readline.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5readline.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5snmp.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5snmp.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5sqlite.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5sqlite.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5wddx.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5wddx.prototype csw/mgar/pkg/php5/trunk/files/CSWphp5xsl.gspec csw/mgar/pkg/php5/trunk/files/CSWphp5xsl.prototype csw/mgar/pkg/php5/trunk/files/config.mk csw/mgar/pkg/php5/trunk/files/depend.mk csw/mgar/pkg/php5/trunk/files/patches.mk csw/mgar/pkg/php5/trunk/files/rules.mk Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,65 +1,101 @@ -GARNAME = php +GARNAME = php GARVERSION = 5.2.6 CATEGORIES = lang DESCRIPTION = A high-level scripting language. define BLURB - PHP is a widely-used Open Source general-purpose scripting language that is - especially suited for Web development and can be embedded into HTML. Its - syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many - different platforms and can be used as a standalone executable or as a - module under a variety of Web servers. It has excellent support for - databases, XML, LDAP, IMAP, Java, various Internet protocols, and general - data manipulation, and is extensible via its powerful API. It is actively - developed and supported by a talented and energetic international team. - Numerous Open Source and commercial PHP-based application packages are - available. + PHP is a widely-used Open Source general-purpose scripting language that is + especially suited for Web development and can be embedded into HTML. Its + syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many + different platforms and can be used as a standalone executable or as a + module under a variety of Web servers. It has excellent support for + databases, XML, LDAP, IMAP, Java, various Internet protocols, and general + data manipulation, and is extensible via its powerful API. It is actively + developed and supported by a talented and energetic international team. + Numerous Open Source and commercial PHP-based application packages are + available. endef +php5_root = $(DESTDIR)$(prefix)/php5 +php5_bin = $(php5_root)/bin +php5_lib = $(php5_root)/lib + +MASTER_SITES = http://us.php.net/distributions/ +SPKG_SOURCEURL = http://www.php.net/downloads.php +DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 + +INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +PHP5ROOT = $(DESTDIR)$(prefix)/php5 + +STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ +STRIP_DIRS += $(PHP5ROOT)/bin + # Auxilliary files DISTFILES += php.ini.CSW phpext DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh -DISTFILES += CSWphp5_ext.depend -# PHP CGI SAPI + Core -DISTFILES += $(call admfiles,CSWphp5,prototype depend postinstall) -DISTFILES += $(call admfiles,CSWphp5devel,prototype depend) +PACKAGES = CSWphp5 CSWphp5devel +CATALOGNAME_CSWphp5 = php5 +SPKG_DESC_CSWphp5 = A High-Level Scripting Languages +DISTFILES += CSWphp5.postinstall +CATALOGNAME_CSWphp5devel = php5_devel +SPKG_DESC_CSWphp5devel = Development files for php5 +REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt +REQUIRED_PKGS_CSWphp5devel = CSWphp5 + +PKGFILES_CSWphp5devel = $(prefix)/php5/bin/php-config +PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize +PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/date/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/pcre/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/pdo/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/spl/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/main/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/php/include/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/regex/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/.*/standard/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/TSRM/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/Zend/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* + +PATCHFILES += config.diff + # PHP Extensions -include files/extensions.mk +EXTDIRLIST = $(shell ls -d extensions/*) +include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) -# Patches -include files/patches.mk +# BerkeleyDB +EXTRA_LIB += $(prefix)/bdb44/lib +EXTRA_INC += $(prefix)/bdb44/lib -# Dependencies -include files/depend.mk +DISTFILES += fixme.sh -# SAPI Common Configuration -include files/config.mk - -# SAPI Specific Configuration +CONFIGURE_ARGS += --prefix=$(prefix)/php5 +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi CONFIGURE_ARGS += --enable-force-cgi-redirect -CONFIGURE_ARGS += --enable-pcntl +CONFIGURE_ARGS += --enable-pcntl=shared +CONFIGURE_ARGS += --enable-pdo=shared +CONFIGURE_ARGS += --with-mm=$(prefix) +CONFIGURE_ARGS += --enable-magic-quotes +CONFIGURE_ARGS += --enable-spl=shared +CONFIGURE_ARGS += --with-pcre-regex +CONFIGURE_ARGS += --with-pear -# System Rules/Configuration -include gar/category.mk +# Disable Tests (report submitted to PHP QA) +SKIPTEST = 1 -# Common Rules -include files/rules.mk - # SAPI Specific Rules STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec # Copy over template config files and utility scripts -post-install: install-templates -php5_root = $(DESTDIR)$(prefix)/php5 -php5_bin = $(php5_root)/bin -php5_lib = $(php5_root)/lib - -install-templates: +post-install-modulated: ginstall -m 0755 \ $(WORKDIR)/phpext \ $(DESTDIR)$(prefix)/php5/bin @@ -69,3 +105,14 @@ $(DESTDIR)$(prefix)/php5/lib @$(MAKECOOKIE) +post-configure-modulated: + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) + +EXTFILES = $(shell find extensions/*/files/* -prune -type f) +pre-fetch: + $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) + +# System Rules/Configuration +include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/checksums 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,3 +1,4 @@ +7380ffecebd95c6edb317ef861229ebd download/php-5.2.6.tar.bz2 e79baa34abe18575a3d0220c21bd5e37 download/php.ini.CSW 90ae3cef3692d7e566c47d89fe39c43d download/phpext de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh @@ -2,63 +3,7 @@ 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh -73ffddc92b833f335a87e42501129a01 download/CSWphp5_ext.depend -d50e24088861d202c3fd55b46a4eff0e download/CSWphp5.gspec -43917cab9cddf386bfacc7c447216b24 download/CSWphp5.prototype -7f6e765815b28f38341e549adcea03d1 download/CSWphp5.depend 8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall -883e5ee2553ce6a4d2436146636ff172 download/CSWphp5devel.gspec -98127f1f33a9e11972d1dca8cbb87944 download/CSWphp5devel.prototype -024c896165221f78b0abc9aa21da70b1 download/CSWphp5devel.depend -0614561dcc8ed10d041ece4a6f135957 download/CSWphp5bz2.gspec -cbfa1e1b3474c4ad96cccd18041067b6 download/CSWphp5bz2.prototype -4e9af10b686cd342e87c8070978221b4 download/CSWphp5curl.gspec -212c83a6824634f9fc54d8fcfd8786b3 download/CSWphp5curl.prototype -6f3b1b51274f5bf368207dccc73b88bf download/CSWphp5dba.gspec -e2463317dc97abfd6d2e77b2001c59ac download/CSWphp5dba.prototype -900288830eada38697da0c1cb53e0d17 download/CSWphp5ftp.gspec -8b086b05800447af47e08461849c0375 download/CSWphp5ftp.prototype -c388f679cae3a526e31e3d8327cf2185 download/CSWphp5gd.gspec -8fd40a985003480ed4507e989df9f7b0 download/CSWphp5gd.prototype -1e71a9d4b1421d8a0262ca29ecd37104 download/CSWphp5gettext.gspec -a879085f53a0953a179cc712bb43f7ac download/CSWphp5gettext.prototype -9e16217d08cd21a3a3209c705a697c3c download/CSWphp5gmp.gspec -f870534537d759e4418d5eb08b224c8f download/CSWphp5gmp.prototype -94a14eb64355a48aab00a5c493c61a3d download/CSWphp5imap.gspec -7bdb5a7a9463d8fdef6c2831e6685753 download/CSWphp5imap.prototype -9cf8d83bb0f0fae8b50ad15298b0c513 download/CSWphp5ldap.gspec -0ebbcc40e25c84e458302ff6db312cef download/CSWphp5ldap.prototype -4f13181edfc973188c5efa85eec1e35b download/CSWphp5mcrypt.gspec -80fc2675c219052c3ca62315e0f8b998 download/CSWphp5mcrypt.prototype -a42951821d4f8c0ecc0f08b35c0fcb99 download/CSWphp5mhash.gspec -fb690c06518ffe72aa25529da1426c3b download/CSWphp5mhash.prototype -a4b3b4d0f14b2b48ef21cc5b89e8b6e7 download/CSWphp5mssql.gspec -67f4b30217f7a35bc89cfd7ed05e6711 download/CSWphp5mssql.prototype -88dfa4e70f14f79cf4144aac9bf389cf download/CSWphp5mysql.gspec -1c4b65285d60975bf67482d5956dfce2 download/CSWphp5mysql.prototype -e43182e2e12ffcdf029196ab863ac2c2 download/CSWphp5mysqli.gspec -0528610e4f0c7e44e5580e71eccf6fa3 download/CSWphp5mysqli.prototype -6a6d6084f86e6f919fb45162d9dcfd3b download/CSWphp5odbc.gspec -0a563e7498064308eb32cdf316673b45 download/CSWphp5odbc.prototype -f655b06824624c911f2c423a3817edfe download/CSWphp5pdomysql.gspec -25139efcdc86eabed378b04b4aaeb1b6 download/CSWphp5pdomysql.prototype -20048422444a43d5bb716d982ce6bdef download/CSWphp5pdoodbc.gspec -14259860b6fb34975c6361646e8b9693 download/CSWphp5pdoodbc.prototype -537d49c87dfa69a6eba01ac2473a7a9e download/CSWphp5pdopgsql.gspec -7f0d4856b625c816d6276645d1a272c8 download/CSWphp5pdopgsql.prototype -73e202abb28c2f8a3714317ac6be9aa4 download/CSWphp5pdosqlite.gspec -3e6512603ad839f47304b7df1e8f8fdf download/CSWphp5pdosqlite.prototype -fac7b86a7bf260ab4866bbe678d2a9ed download/CSWphp5pgsql.gspec -6b003c88f7ff6a67958840fbdecede8b download/CSWphp5pgsql.prototype -7cc1932f3d60f28d16333b117b9a0172 download/CSWphp5pspell.gspec -7cc3cdd30d2491da8d459b888a6cef91 download/CSWphp5pspell.prototype -729e5eb6c903124f4333c0bbacb8fcee download/CSWphp5readline.gspec -16f9b12bf4d817b048a576d1fe445a0d download/CSWphp5readline.prototype -80cf708c6d0800275c33f08ab7b1c826 download/CSWphp5snmp.gspec -fb1b48a659a89454d3c093b18e17aca0 download/CSWphp5snmp.prototype -c75d314921d14f6ca01770ece24431da download/CSWphp5sqlite.gspec -769724dbf9f01aa3b9cb669faff3aab6 download/CSWphp5sqlite.prototype -9fbaa2d21b7c0166b53e4c314fb7d7c8 download/CSWphp5wddx.gspec -bd09caea29de9dc8dc13dd1386c824c4 download/CSWphp5wddx.prototype -58ba92a544570ec4b613bcc409a42a23 download/CSWphp5xsl.gspec -3c2e92e41c207955a7ce600e46531b0d download/CSWphp5xsl.prototype -7380ffecebd95c6edb317ef861229ebd download/php-5.2.6.tar.bz2 -a03ecfbc83c95890b9167f7324e5d7a8 download/config.diff +41ec540885de7c34625768aa1fb9682b download/fixme.sh +2b657c95c6abef5f125f19265060f91d download/config.diff +2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff +230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff +13db46097c9686302bebf160e2d26ed2 download/pgsql.diff Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = bcmath -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5bcmath -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5bcmath = php5_bcmath +SPKG_DESC_CSWphp5bcmath = bcmath Extention for PHP5 +REQUIRED_PKGS_CSWphp5bcmath = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-bcmath=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5bcmath = .*/lib/php/extensions/.*/bcmath.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = bz2 -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5bz2 -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5bz2 = php5_bz2 +SPKG_DESC_CSWphp5bz2 = bz2 Extention for PHP5 +REQUIRED_PKGS_CSWphp5bz2 = CSWphp5 CSWbzip2 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-bz2=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWbzip2 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5bz2 = .*/lib/php/extensions/.*/bz2.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = calendar -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5calendar -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5calendar = php5_calendar +SPKG_DESC_CSWphp5calendar = calendar Extention for PHP5 +REQUIRED_PKGS_CSWphp5calendar = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-calendar=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5calendar = .*/lib/php/extensions/.*/calendar.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = ctype -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5ctype -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5ctype = php5_ctype +SPKG_DESC_CSWphp5ctype = ctype Extention for PHP5 +REQUIRED_PKGS_CSWphp5ctype = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-ctype=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5ctype = .*/lib/php/extensions/.*/ctype.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,53 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = curl -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5curl -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5curl = php5_curl +SPKG_DESC_CSWphp5curl = curl Extention for PHP5 +REQUIRED_PKGS_CSWphp5curl = CSWphp5 CSWcurlrt CSWlibidn +REQUIRED_PKGS_CSWphp5curl += CSWoldaprt CSWosslrt CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWcurlrt CSWlibidn -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) += CSWoldaprt CSWosslrt CSWzlib - - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-curl=$(prefix) +CONFIGURE_ARGS += --with-curl=shared,$(prefix) CONFIGURE_ARGS += --with-curlwrappers -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5curl = .*/lib/php/extensions/.*/curl.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,15 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = dba -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5dba -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5dba = php5_dba +SPKG_DESC_CSWphp5dba = dba Extention for PHP5 +REQUIRED_PKGS_CSWphp5dba = CSWphp5 CSWbdb44 CSWgdbm -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-dba=shared +CONFIGURE_ARGS += --with-ndbm +CONFIGURE_ARGS += --with-gdbm=$(prefix) +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb44 -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5dba = .*/lib/php/extensions/.*/dba\.so Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = dbase -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5dbase -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5dbase = php5_dbase +SPKG_DESC_CSWphp5dbase = dbase Extention for PHP5 +REQUIRED_PKGS_CSWphp5dbase = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-dbase=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5dbase = .*/lib/php/extensions/.*/dbase.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,51 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = dom -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5dom -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5dom = php5_dom +SPKG_DESC_CSWphp5dom = dom Extention for PHP5 +REQUIRED_PKGS_CSWphp5dom = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWiconv CSWlibxml2 CSWzlib - - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config +CONFIGURE_ARGS += --enable-dom=shared CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5dom = .*/lib/php/extensions/.*/dom.* +PKGFILES_CSWphp5dom += .*/include/php/ext/dom/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,52 +1,14 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = exif -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5exif -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5exif = php5_exif +SPKG_DESC_CSWphp5exif = exif Extention for PHP5 +REQUIRED_PKGS_CSWphp5exif = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-exif=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 -PATCHFILES = exif.diff - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk CPPFLAGS="-I../ext/mbstring" export CPPFLAGS + +PKGFILES_CSWphp5exif = .*/lib/php/extensions/.*/exif.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = filter -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5filter -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5filter = php5_filter +SPKG_DESC_CSWphp5filter = filter Extention for PHP5 +REQUIRED_PKGS_CSWphp5filter = CSWphp5 CSWpcrert -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-filter=shared +CONFIGURE_ARGS += --with-pcre-dir=$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5filter = .*/lib/php/extensions/.*/filter.* +PKGFILES_CSWphp5filter += .*/include/php/ext/filter/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = ftp -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5ftp -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5ftp = php5_ftp +SPKG_DESC_CSWphp5ftp = ftp Extention for PHP5 +REQUIRED_PKGS_CSWphp5ftp = CSWphp5 CSWosslrt -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-ftp=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5ftp = .*/lib/php/extensions/.*/ftp.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,56 +1,23 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = gd -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5gd -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5gd = php5_gd +SPKG_DESC_CSWphp5gd = gd Extention for PHP5 +REQUIRED_PKGS_CSWphp5gd = CSWphp5 CSWftype2 CSWgd CSWjpeg +REQUIRED_PKGS_CSWphp5gd += CSWpng CSWt1lib CSWxpm CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-gd=$(prefix) +CONFIGURE_ARGS += --with-gd=shared,$(prefix) CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) CONFIGURE_ARGS += --with-png-dir=$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) CONFIGURE_ARGS += --with-xpm-dir=$(prefix) CONFIGURE_ARGS += --with-ttf=$(prefix) CONFIGURE_ARGS += --with-freetype-dir=$(prefix) +CONFIGURE_ARGS += --with-t1lib=$(prefix) +CONFIGURE_ARGS += --enable-gd-native-ttf +CONFIGURE_ARGS += --enable-gd-jis-conv -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.* +PKGFILES_CSWphp5gd += .*/include/php/ext/gd/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = gettext -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5gettext -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5gettext = php5_gettext +SPKG_DESC_CSWphp5gettext = gettext Extention for PHP5 +REQUIRED_PKGS_CSWphp5gettext = CSWphp5 CSWggettextrt -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-gettext=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWggettextrt - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5gettext = .*/lib/php/extensions/gettext.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = gmp -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5gmp -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5gmp = php5_gmp +SPKG_DESC_CSWphp5gmp = gmp Extention for PHP5 +REQUIRED_PKGS_CSWphp5gmp = CSWphp5 CSWlibgmp -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-gmp=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWlibgmp - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-gmp=$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5gmp = .*/lib/php/extensions/.*/gmp.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = hash -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5hash -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5hash = php5_hash +SPKG_DESC_CSWphp5hash = hash Extention for PHP5 +REQUIRED_PKGS_CSWphp5hash = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-hash=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5hash = .*/lib/php/extensions/.*/hash.* +PKGFILES_CSWphp5hash += .*/include/php/ext/hash/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,19 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = iconv -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5iconv -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5iconv = php5_iconv +SPKG_DESC_CSWphp5iconv = iconv Extention for PHP5 +REQUIRED_PKGS_CSWphp5iconv = CSWphp5 CSWiconv -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-iconv=shared +CONFIGURE_ARGS += --with-iconv-dir=$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +EXTRA_CFLAGS += -I/opt/csw/include +EXTRA_LDFLAGS += -L$(libdir) -R$(libdir) +LIBS = -lrt -lintl -PACKAGES = CSWphp5$(PHP5EXT_NAME) +#PATCHFILES += iconv.diff -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWiconv - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-iconv=$(prefix) - -LIBS = -lrt -lintl - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5iconv = .*/lib/php/extensions/.*/iconv.* +PKGFILES_CSWphp5iconv += .*/include/php/ext/iconv/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/files/iconv.diff 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,19 +1,20 @@ ---- php-5.2.6/ext/iconv/iconv.c.orig 2009-03-02 13:22:39.048498744 -0600 -+++ php-5.2.6/ext/iconv/iconv.c 2009-03-02 13:21:25.719941997 -0600 -@@ -41,12 +41,15 @@ +--- php-5.2.6/ext/iconv/iconv.c.orig 2009-03-02 13:49:44.329860879 -0600 ++++ php-5.2.6/ext/iconv/iconv.c 2009-03-02 13:51:43.162160187 -0600 +@@ -38,14 +38,17 @@ + #include + #include "php_iconv.h" ++#include + #ifdef HAVE_ICONV +/* #ifdef PHP_ICONV_H_PATH #include PHP_ICONV_H_PATH #else -+*/ #include -+/* #endif -- +*/ + #ifdef HAVE_GLIBC_ICONV #include - #endif Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,54 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = imap -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5imap -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5imap = php5_imap +SPKG_DESC_CSWphp5imap = imap Extention for PHP5 +REQUIRED_PKGS_CSWphp5imap = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWimaprt CSWkrb5lib CSWosslrt - - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-imap=$(prefix) +CONFIGURE_ARGS += --with-imap=shared,$(prefix) CONFIGURE_ARGS += --with-kerberos=$(prefix) CONFIGURE_ARGS += --with-imap-ssl=$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5imap = .*/lib/php/extensions/.*/imap.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = json -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5json -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5json = php5_json +SPKG_DESC_CSWphp5json = json Extention for PHP5 +REQUIRED_PKGS_CSWphp5json = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-json=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5json = .*/lib/php/extensions/.*/json.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = ldap -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5ldap -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5ldap = php5_ldap +SPKG_DESC_CSWphp5ldap = ldap Extention for PHP5 +REQUIRED_PKGS_CSWphp5ldap = CSWphp5 CSWoldaprt CSWsasl -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-ldap=shared,$(prefix) +CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWoldaprt - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5ldap = .*/lib/php/extensions/.*/ldap.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,14 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mbstring -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mbstring -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5mbstring = php5_mbstring +SPKG_DESC_CSWphp5mbstring = mbstring Extention for PHP5 +REQUIRED_PKGS_CSWphp5mbstring = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +CONFIGURE_ARGS += --enable-mbstring=shared +CONFIGURE_ARGS += --enable-mbregex=shared - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - -TEST_SCRIPTS = testme - -test-testme: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php; export TEST_PHP_EXECUTABLE; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - - -include gar/category.mk +PKGFILES_CSWphp5mbstring = .*/lib/php/extensions/.*/mbstring.* +PKGFILES_CSWphp5mbstring += .*/include/php/ext/mbstring/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mcrypt -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mcrypt -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5mcrypt = php5_mcrypt +SPKG_DESC_CSWphp5mcrypt = mcrypt Extention for PHP5 +REQUIRED_PKGS_CSWphp5mcrypt = CSWphp5 CSWlibmcrypt CSWlibtoolrt -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWlibmcrypt CSWlibtoolrt - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-mcrypt=$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5mcrypt = .*/lib/php/extensions/.*/mcrypt.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mhash -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mhash -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5mhash = php5_mhash +SPKG_DESC_CSWphp5mhash = mhash Extention for PHP5 +REQUIRED_PKGS_CSWphp5mhash = CSWphp5 CSWlibmhash -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-mhash=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWlibmhash - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-mhash=$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5mhash = .*/lib/php/extensions/.*/mhash.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mime_magic -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mimemagic -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) - -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5mimemagic - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5mimemagic = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5mimemagic = $(PHP5EXT_NAME) Extention for PHP5 +CATALOGNAME_CSWphp5mimemagic = php5_mime_magic +SPKG_DESC_CSWphp5mimemagic = mime magic Extention for PHP5 REQUIRED_PKGS_CSWphp5mimemagic = CSWphp5 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config +CONFIGURE_ARGS += --with-mime-magic=shared -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5mimemagic = .*/lib/php/extensions/.*/mime_magic.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mssql -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mssql -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5mssql = php5_mssql +SPKG_DESC_CSWphp5mssql = mssql Extention for PHP5 +REQUIRED_PKGS_CSWphp5mssql = CSWphp5 CSWfreetds -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-mssql=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWfreetds - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-mssql=$(prefix) -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5mssql = .*/lib/php/extensions/.*/mssql.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mysql -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mysql -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5mysql = php5_mysql +SPKG_DESC_CSWphp5mysql = mysql Extention for PHP5 +REQUIRED_PKGS_CSWphp5mysql = CSWphp5 CSWmysql5rt -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-mysql=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWmysql5rt - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-mysql=$(prefix) -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so.* +PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.a.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = mysqli -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5mysqli -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5mysqli = php5_mysqli +SPKG_DESC_CSWphp5mysqli = mysqli Extention for PHP5 +REQUIRED_PKGS_CSWphp5mysqli = CSWphp5 CSWmysql5rt CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-mysqli=shared,$(bindir)/mysql_config -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWmysql5rt CSWzlib - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-mysqli=$(bindir)/mysql_config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5mysqli = .*/lib/php/extensions/.*/mysqli.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = ncurses -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5ncurses -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5ncurses = php5_ncurses +SPKG_DESC_CSWphp5ncurses = ncurses Extention for PHP5 +REQUIRED_PKGS_CSWphp5ncurses = CSWphp5 CSWncurses -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-ncurses=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWncurses - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-ncurses=/opt/csw - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5ncurses = .*/lib/php/extensions/.*/ncurses.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,52 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = odbc -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5odbc -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5odbc = php5_odbc +SPKG_DESC_CSWphp5odbc = odbc Extention for PHP5 +REQUIRED_PKGS_CSWphp5odbc = CSWphp5 CSWunixodbc -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +PATCHFILES += odbc.diff -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWunixodbc - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-unixODBC=$(prefix) - -PATCHFILES = odbc.diff - -post-patch-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5odbc = .*/lib/php/extensions/.*/odbc.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/files/odbc.diff =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/files/odbc.diff 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/files/odbc.diff 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,5 +1,5 @@ ---- ./config.m4.orig 2009-02-25 12:04:48.140914150 -0600 -+++ ./config.m4 2009-02-25 12:15:55.740367734 -0600 +--- php-5.2.6/ext/odbc/config.m4.orig 2009-02-25 12:04:48.140914150 -0600 ++++ php-5.2.6/ext/odbc/config.m4 2009-02-25 12:15:55.740367734 -0600 @@ -8,402 +8,6 @@ fi ]) Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = openssl -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5openssl -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5openssl = php5_openssl +SPKG_DESC_CSWphp5openssl = openssl Extention for PHP5 +REQUIRED_PKGS_CSWphp5openssl = CSWphp5 CSWosslrt CSWkrb5lib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-openssl=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWosslrt - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; /bin/mv config0.m4 config.m4 ) - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5openssl = .*/lib/php/extensions/.*/openssl.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pcntl -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pcntl -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5pcntl = php5_pcntl +SPKG_DESC_CSWphp5pcntl = pcntl Extention for PHP5 +REQUIRED_PKGS_CSWphp5pcntl = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-pcntl=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pcntl = .*/lib/php/extensions/.*/pcntl.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,53 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pdomysql -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pdomysql -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/pdo_mysql +CATALOGNAME_CSWphp5pdomysql = php5_pdomysql +SPKG_DESC_CSWphp5pdomysql = pdomysql Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdomysql = CSWphp5 CSWmysql5rt CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWmysql5rt CSWzlib - - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-pdo-mysql=$(prefix) +CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pdomysql = .*/lib/php/extensions/.*/pdo_mysql.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pdoodbc -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pdoodbc -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/pdo_odbc +CATALOGNAME_CSWphp5pdoodbc = php5_pdoodbc +SPKG_DESC_CSWphp5pdoodbc = pdoodbc Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 CSWunixodbc -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWunixodbc - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-pdo-odbc=unixODBC,$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,52 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pdopgsql -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pdopgsql -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/pdo_pgsql +CATALOGNAME_CSWphp5pdopgsql = php5_pdopgsql +SPKG_DESC_CSWphp5pdopgsql = pdopgsql Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdopgsql = CSWphp5 CSWlibpq -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +PATCHFILES += pdopgsql.diff -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWlibpq - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-pdo-pgsql=$(prefix)/postgresql - -PATCHFILES = config.diff - -pre-configure-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pdosqlite -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pdosqlite -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/pdo_sqlite +CATALOGNAME_CSWphp5pdosqlite = php5_pdosqlite +SPKG_DESC_CSWphp5pdosqlite = pdosqlite Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdosqlite = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-pdo-sqlite=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,52 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pgsql -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pgsql -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5pgsql = php5_pgsql +SPKG_DESC_CSWphp5pgsql = pgsql Extention for PHP5 +REQUIRED_PKGS_CSWphp5pgsql = CSWphp5 CSWlibpq -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +PATCHFILES += pgsql.diff -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +CONFIGURE_ARGS += --with-pgsql=shared,$(prefix)/postgresql - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWlibpq - -PATCHFILES = pgconfig.diff - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql - -post-patch-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pgsql = .*/lib/php/extensions/.*/pgsql.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = posix -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5posix -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5posix = php5_posix +SPKG_DESC_CSWphp5posix = posix Extention for PHP5 +REQUIRED_PKGS_CSWphp5posix = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-posix=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5posix = .*/lib/php/extensions/.*/posix.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = pspell -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5pspell -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5pspell = php5_pspell +SPKG_DESC_CSWphp5pspell = pspell Extention for PHP5 +REQUIRED_PKGS_CSWphp5pspell = CSWphp5 CSWaspell -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-pspell=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWaspell - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-pspell=$(prefix) - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5pspell = .*/lib/php/extensions/.*/pspell.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang -PHP5EXT_NAME = recode - -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef - -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) - -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWrecode - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config -CONFIGURE_ARGS += --with-recode=$(prefix) - -PATCHFILES = recode.diff - -post-patch-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +@ ( echo "==> Not configuring recode see README in extensions/php5_recode" ) Modified: csw/mgar/pkg/php5/trunk/extensions/php5_recode/files/recode.diff =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_recode/files/recode.diff 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_recode/files/recode.diff 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,5 +1,5 @@ ---- ./recode.c.orig 2009-02-25 11:18:18.179302185 -0600 -+++ ./recode.c 2009-02-25 11:20:18.906816126 -0600 +--- php-5.2.6/ext/recode/recode.c.orig 2009-02-25 11:18:18.179302185 -0600 ++++ php-5.2.6/ext/recode/recode.c 2009-02-25 11:20:18.906816126 -0600 @@ -221,7 +221,7 @@ /* }}} */ @@ -9,8 +9,8 @@ /* * Local variables: * tab-width: 4 ---- ./config.m4.orig 2009-02-25 11:24:11.727519777 -0600 -+++ ./config.m4 2009-02-25 11:24:44.598312108 -0600 +--- php-5.2.6/ext/recode/config.m4.orig 2009-02-25 11:24:11.727519777 -0600 ++++ php-5.2.6/ext/recode/config.m4 2009-02-25 11:24:44.598312108 -0600 @@ -41,6 +41,7 @@ LIBS="$LIBS -lrecode" AC_TRY_LINK( Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = session -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5session -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5session = php5_session +SPKG_DESC_CSWphp5session = session Extention for PHP5 +REQUIRED_PKGS_CSWphp5session = CSWphp5 CSWlibmm -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-session=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.* +PKGFILES_CSWphp5session += .*/include/php/ext/session/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = shmop -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5shmop -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5shmop = php5_shmop +SPKG_DESC_CSWphp5shmop = shmop Extention for PHP5 +REQUIRED_PKGS_CSWphp5shmop = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-shmop=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5shmop = .*/lib/php/extensions/.*/shmop.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,52 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = simplexml -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5simplexml -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5simplexml = php5_simplexml +SPKG_DESC_CSWphp5simplexml = simplexml Extention for PHP5 +REQUIRED_PKGS_CSWphp5simplexml = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) -PATCHFILES = simplexml.diff - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWiconv CSWlibxml2 CSWzlib - - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config +CONFIGURE_ARGS += --enable-simplexml=shared CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5simplexml = .*/lib/php/extensions/.*/simplexml.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = snmp -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5snmp -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5snmp = php5_snmp +SPKG_DESC_CSWphp5snmp = snmp Extention for PHP5 +REQUIRED_PKGS_CSWphp5snmp = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-snmp=shared,$(prefix) -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWnetsnmp CSWosslrt CSWtcpwrap - - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5snmp = .*/lib/php/extensions/.*/snmp.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,50 +1,12 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = soap -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5soap -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5soap = php5_soap +SPKG_DESC_CSWphp5soap = soap Extention for PHP5 +REQUIRED_PKGS_CSWphp5soap = CSWphp5 CSWiconv CSWlibxml2 CSWzlib -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin - -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 CSWiconv CSWlibxml2 CSWzlib - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config +CONFIGURE_ARGS += --enable-soap=shared CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5soap = .*/lib/php/extensions/.*/soap.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = sockets -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5sockets -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5sockets = php5_sockets +SPKG_DESC_CSWphp5sockets = sockets Extention for PHP5 +REQUIRED_PKGS_CSWphp5sockets = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-sockets=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5sockets = .*/lib/php/extensions/.*/sockets.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,13 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = sqlite -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5sqlite -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5sqlite = php5_sqlite +SPKG_DESC_CSWphp5sqlite = sqlite Extention for PHP5 +REQUIRED_PKGS_CSWphp5sqlite = CSWphp5 CSWsqlite -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --with-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --enable-sqlite-utf8 -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5sqlite = .*/lib/php/extensions/.*/sqlite.* +PKGFILES_CSWphp5sqlite += .*/include/php/ext/sqlite/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = sysvmsg -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5sysvmsg -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5sysvmsg = php5_sysvmsg +SPKG_DESC_CSWphp5sysvmsg = sysvmsg Extention for PHP5 +REQUIRED_PKGS_CSWphp5sysvmsg = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP_PREFIX = $(prefix)/php5 -PHP_BIN = $(PHP_PREFIX)/bin +CONFIGURE_ARGS += --enable-sysvsem=shared -PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - - -PACKAGES = CSWphp5$(PHP5EXT_NAME) - -MASTER_SITES = http://www.php.net/releases/ -SPKG_SOURCEURL = http://www.php.net/get/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -DISTFILES = $(DISTNAME).tar.bz2 - -CATALOGNAME_CSWphp5$(PHP5EXT_NAME) = php5_$(PHP5EXT_NAME) -SPKG_DESC_CSWphp5$(PHP5EXT_NAME) = $(PHP5EXT_NAME) Extention for PHP5 -REQUIRED_PKGS_CSWphp5$(PHP5EXT_NAME) = CSWphp5 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-php-config=$(PHP_BIN)/php-config - -post-extract-modulated: - @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) - $(DONADA) - - -TEST_SCRIPTS = manual - -test-manual: - @( TEST_PHP_EXECUTABLE=$(PHP_BIN)/php ; export TEST_PHP_EXECUTABLE ; \ - cd $(WORKSRC); $(PHP_BIN)/php ./run-tests.php -q ) - $(DONADA) - -include gar/category.mk +PKGFILES_CSWphp5sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-03-06 02:27:11 UTC (rev 3601) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-03-06 02:33:08 UTC (rev 3602) @@ -1,49 +1,11 @@ -GARNAME = php -GARVERSION = 5.2.6 -CATEGORIES = lang PHP5EXT_NAME = sysvsem -DESCRIPTION = $(PHP5EXT_NAME) Extention for PHP -define BLURB - $(PHP5EXT_NAME) Extention for PHP -endef +PACKAGES += CSWphp5sysvsem -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/ext/$(PHP5EXT_NAME) +CATALOGNAME_CSWphp5sysvsem = php5_sysvsem +SPKG_DESC_CSWphp5sysvsem = sysvsem Extention for PHP5 +REQUIRED_PKGS_CSWphp5sysvsem = CSWphp5 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 6 05:15:24 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 06 Mar 2009 04:15:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[3603] csw/mgar/pkg/php5/trunk Message-ID: Revision: 3603 http://gar.svn.sourceforge.net/gar/?rev=3603&view=rev Author: valholla Date: 2009-03-06 04:15:24 +0000 (Fri, 06 Mar 2009) Log Message: ----------- add php5_pdo and fix a few missing files in extentions Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/files/ Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -61,7 +61,7 @@ PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.* PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* -PATCHFILES += config.diff +PATCHFILES += configure.diff # PHP Extensions EXTDIRLIST = $(shell ls -d extensions/*) Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/checksums 2009-03-06 04:15:24 UTC (rev 3603) @@ -5,7 +5,7 @@ 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh 8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall 41ec540885de7c34625768aa1fb9682b download/fixme.sh -2b657c95c6abef5f125f19265060f91d download/config.diff +2b657c95c6abef5f125f19265060f91d download/configure.diff 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff 230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff 13db46097c9686302bebf160e2d26ed2 download/pgsql.diff Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -13,3 +13,4 @@ PKGFILES_CSWphp5dba = .*/lib/php/extensions/.*/dba\.so +PKGFILES_CSWphp5dba += .*/lib/php/extensions/.*/dba\.a Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -8,4 +8,4 @@ CONFIGURE_ARGS += --with-gettext=shared,$(prefix) -PKGFILES_CSWphp5gettext = .*/lib/php/extensions/gettext.* +PKGFILES_CSWphp5gettext = .*/lib/php/extensions/.*/gettext.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -8,5 +8,5 @@ CONFIGURE_ARGS += --with-mysql=shared,$(prefix) -PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so.* -PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.a.* +PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so +PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.a Added: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile (rev 0) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -0,0 +1,10 @@ +PHP5EXT_NAME = pdo + +PACKAGES += CSWphp5pdo + +CATALOGNAME_CSWphp5pdoodbc = php5_pdo +SPKG_DESC_CSWphp5pdoodbc = pdo Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 + +PKGFILES_CSWphp5pdoodbc = .*/lib/php/extensions/.*/pdo\.so +PKGFILES_CSWphp5pdoodbc += .*/lib/php/extensions/.*/pdo\.a Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdomysql = php5_pdomysql SPKG_DESC_CSWphp5pdomysql = pdomysql Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdomysql = CSWphp5 CSWmysql5rt CSWzlib +REQUIRED_PKGS_CSWphp5pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5pdo CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdoodbc = php5_pdoodbc SPKG_DESC_CSWphp5pdoodbc = pdoodbc Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 CSWunixodbc +REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 CSWunixodbc CSWphp5pdo CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdopgsql = php5_pdopgsql SPKG_DESC_CSWphp5pdopgsql = pdopgsql Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdopgsql = CSWphp5 CSWlibpq +REQUIRED_PKGS_CSWphp5pdopgsql = CSWphp5 CSWlibpq CSWphp5pdo PATCHFILES += pdopgsql.diff Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdosqlite = php5_pdosqlite SPKG_DESC_CSWphp5pdosqlite = pdosqlite Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdosqlite = CSWphp5 +REQUIRED_PKGS_CSWphp5pdosqlite = CSWphp5 CSWphp5pdo CONFIGURE_ARGS += --with-pdo-sqlite=shared Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-03-06 02:33:08 UTC (rev 3602) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-03-06 04:15:24 UTC (rev 3603) @@ -10,6 +10,7 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) -PKGFILES_CSWphp5xml = .*/lib/php/extensions/.*/xml.so -PKGFILES_CSWphp5xml = .*/include/php/ext/xml/.* -PKGFILES_CSWphp5xml = .*/include/php/ext/libxml/.* +PKGFILES_CSWphp5xml = .*/lib/php/extensions/.*/xml.so +PKGFILES_CSWphp5xml += .*/lib/php/extensions/.*/xml.a +PKGFILES_CSWphp5xml += .*/include/php/ext/xml/.* +PKGFILES_CSWphp5xml += .*/include/php/ext/libxml/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 6 07:07:00 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 06 Mar 2009 06:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[3604] csw/mgar/pkg/alpine Message-ID: Revision: 3604 http://gar.svn.sourceforge.net/gar/?rev=3604&view=rev Author: valholla Date: 2009-03-06 06:06:59 +0000 (Fri, 06 Mar 2009) Log Message: ----------- check in working copy Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile csw/mgar/pkg/alpine/trunk/checksums Added Paths: ----------- csw/mgar/pkg/alpine/Makefile csw/mgar/pkg/alpine/trunk/files/pubcookie.diff Added: csw/mgar/pkg/alpine/Makefile =================================================================== --- csw/mgar/pkg/alpine/Makefile (rev 0) +++ csw/mgar/pkg/alpine/Makefile 2009-03-06 06:06:59 UTC (rev 3604) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2009-03-06 04:15:24 UTC (rev 3603) +++ csw/mgar/pkg/alpine/trunk/Makefile 2009-03-06 06:06:59 UTC (rev 3604) @@ -1,5 +1,5 @@ GARNAME = alpine -GARVERSION = 2.0 +GARVERSION = 2.00 CATEGORIES = apps DESCRIPTION = Alpine Messaging System @@ -12,8 +12,8 @@ is highly customizable through the use of the Alpine Setup command. endef -MASTER_SITES = http://www.washington.edu/alpine -SPKG_SOURCE_URL = ftp://ftp.cac.washington.edu/alpine/ +MASTER_SITES = http://www.washington.edu/alpine/ +UPSTREAM_MASTER_SITES = ftp://ftp.cac.washington.edu/alpine/ DISTFILES = $(GARNAME).tar.bz2 PACKAGES = CSWalpine @@ -24,8 +24,36 @@ # upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -#BUILD64 = 1 +## Needs gcc to compile imap support since ucbcc +## does not work on the buildfarm. GCC 4 does not work +## GCC4 thows the following errors: +## warning: pointer targets in passing argument 2 of 'compare_cstring' +## differ in signedness +GARCOMPILER = GCC3 +# Patch for solaris explained in the following thread +# http://mailman2.u.washington.edu/pipermail/alpine-info/2007-December/000047.html +PATCHFILES = pubcookie.diff + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-quotas +CONFIGURE_ARGS += --enable-from-encoding +CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) +CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) +CONFIGURE_ARGS += --with-pubcookie +CONFIGURE_ARGS += --with-system-pinerc=$(libdir)/pine.conf +CONFIGURE_ARGS += --with-system-fixed-pinercc=$(libdir)/pine.conf.fixed +CONFIGURE_ARGS += --with-ssl-dir=$(prefix) +CONFIGURE_ARGS += --with-krb5-dir=$(prefix) +CONFIGURE_ARGS += --with-ldap-dir=$(prefix) +CONFIGURE_ARGS += --with-tcl-lib=$(libdir)/tcl8.4 +CONFIGURE_ARGS += --with-c-client-target=gso +CONFIGURE_ARGS += --with-web-bin=$(libexecdir)/alpine/bin +## Libs that are not get set correctly in Makefiles +LIBS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv +export LIBS + +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/alpine/trunk/checksums =================================================================== --- csw/mgar/pkg/alpine/trunk/checksums 2009-03-06 04:15:24 UTC (rev 3603) +++ csw/mgar/pkg/alpine/trunk/checksums 2009-03-06 06:06:59 UTC (rev 3604) @@ -0,0 +1,2 @@ +84e44cbf71ed674800a5d57eed9c1c52 download/alpine.tar.bz2 +750d6056b6d88022cbb465a9a40f741a download/pubcookie.diff Added: csw/mgar/pkg/alpine/trunk/files/pubcookie.diff =================================================================== --- csw/mgar/pkg/alpine/trunk/files/pubcookie.diff (rev 0) +++ csw/mgar/pkg/alpine/trunk/files/pubcookie.diff 2009-03-06 06:06:59 UTC (rev 3604) @@ -0,0 +1,160 @@ +--- alpine-2.00/web/src/pubcookie/wp_uidmapper.c.orig 2009-03-05 22:41:25.411701357 -0600 ++++ alpine-2.00/web/src/pubcookie/wp_uidmapper.c 2009-03-05 22:42:00.628611160 -0600 +@@ -16,6 +16,10 @@ + #include "id_table.h" + #include "wp_uidmapper_lib.h" + ++#ifndef LOG_PERROR ++#define LOG_PERROR 0 ++#endif ++ + + /* Makefile should #define: + * +@@ -51,7 +55,7 @@ + + id_table_range *range; + id_table table; +- struct sockaddr_un sun,rsun; ++ struct sockaddr_un lsun,rsun; + struct sigaction sa; + int is_err,i,ssock,uid; + unsigned int kbuf[WP_KEY_LEN]; +@@ -61,7 +65,9 @@ + #ifndef DGRAM_MODE + int csock,rsun_len; + #endif +- struct ucred cred; ++#ifdef SO_PEERCRED ++struct ucred cred; ++#endif + + /* + * process command line arguments +@@ -129,10 +135,10 @@ + syslog(LOG_ERR,"%s: socket: %s\n",socketname,strerror(errno)); + exit(1); + } +- /* sun.sun_len = strlen(socketname) + 1; */ +- sun.sun_family = AF_UNIX; +- strcpy(sun.sun_path,socketname); +- if(bind(ssock,(struct sockaddr*)&sun,sizeof(sun))) { ++ /* lsun.sun_len = strlen(socketname) + 1; */ ++ lsun.sun_family = AF_UNIX; ++ strcpy(lsun.sun_path,socketname); ++ if(bind(ssock,(struct sockaddr*)&lsun,sizeof(lsun))) { + syslog(LOG_ERR,"%s: bind: %s\n",socketname,strerror(errno)); + exit(1); + } +@@ -166,9 +172,14 @@ + rmh.msg_namelen = sizeof(rsun); + rmh.msg_iov = riov; + rmh.msg_iovlen = 3; ++#ifdef VANILLA + rmh.msg_control = cbuf; + rmh.msg_controllen = riov[0].iov_len + riov[1].iov_len + riov[2].iov_len; + rmh.msg_flags = 0; ++#else ++ rmh.msg_accrights = NULL; ++ rmh.msg_accrightslen = 0; ++#endif + + /* siov[0].iov_base */ + /* siov[0].iov_len */ +@@ -176,9 +187,15 @@ + smh.msg_namelen = 0; + smh.msg_iov = siov; + /* smh.msg_iovlen */ ++#ifdef VANILLA + smh.msg_control = NULL; + smh.msg_controllen = 0; + smh.msg_flags = 0; ++#else ++ smh.msg_accrights = NULL; ++ smh.msg_accrightslen = 0; ++#endif ++ + + #ifndef DGRAM_MODE + csock = -1; +@@ -196,6 +213,7 @@ + syslog(LOG_ERR,"accept: %s\n",strerror(errno)); + break; + } ++#ifdef SO_PEERCRED + if(debug >= 2) { + i = sizeof(cred); + if(getsockopt(csock,SOL_SOCKET,SO_PEERCRED,&cred,&i) == -1) { +@@ -205,6 +223,7 @@ + cred.pid,cred.uid,cred.gid); + } + } ++#endif + i = recvmsg(csock,&rmh,0); + #endif + +--- alpine-2.00/web/src/pubcookie/wp_uidmapper_lib.c.orig 2009-03-05 22:41:35.393957770 -0600 ++++ alpine-2.00/web/src/pubcookie/wp_uidmapper_lib.c 2009-03-05 22:42:00.638013846 -0600 +@@ -23,7 +23,7 @@ + struct iovec *in,int inlen,int *rinbytes) { + int sock,i; + struct msghdr mh; +- struct sockaddr_un sun; ++ struct sockaddr_un lsun; + + #ifdef DGRAM_MODE + sock = socket(AF_UNIX,SOCK_DGRAM,0); +@@ -32,17 +32,23 @@ + #endif + if(sock < 0) return -1; + +- sun.sun_family = AF_UNIX; +- strcpy(sun.sun_path,sockname); +- if(connect(sock,(struct sockaddr*)&sun,sizeof(sun))) return -1; ++ lsun.sun_family = AF_UNIX; ++ strcpy(lsun.sun_path,sockname); ++ if(connect(sock,(struct sockaddr*)&lsun,sizeof(lsun))) return -1; + + mh.msg_name = NULL; + mh.msg_namelen = 0; + mh.msg_iov = out; + mh.msg_iovlen = outlen; ++#ifdef VANILLA + mh.msg_control = NULL; + mh.msg_controllen = 0; + mh.msg_flags = 0; ++#else ++ mh.msg_accrights = NULL; ++ mh.msg_accrightslen = 0; ++#endif ++ + + if((i = sendmsg(sock,&mh,0)) == -1) { + close(sock); +@@ -53,7 +59,9 @@ + if(in) { + mh.msg_iov = in; + mh.msg_iovlen = inlen; ++#ifdef VANILLA + mh.msg_flags = 0; ++#endif + if((i = recvmsg(sock,&mh,0)) == -1) { + close(sock); + return -1; +--- alpine-2.00/web/src/pubcookie/id_table.c.orig 2009-03-05 22:41:42.220578266 -0600 ++++ alpine-2.00/web/src/pubcookie/id_table.c 2009-03-05 22:42:00.624274635 -0600 +@@ -10,6 +10,14 @@ + #include /* opendir */ + #include /* stat */ + ++#ifndef VANILLA ++#include /* bzero */ ++#include /* NAME_MAX */ ++#ifndef NAME_MAX ++#define NAME_MAX 14 ++#endif ++#endif ++ + unsigned long hash_func(char *string,unsigned long num_buckets) { + unsigned long i; + char *p; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 6 07:11:09 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 06 Mar 2009 06:11:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3605] csw/mgar/pkg/php5/trunk/extensions Message-ID: Revision: 3605 http://gar.svn.sourceforge.net/gar/?rev=3605&view=rev Author: valholla Date: 2009-03-06 06:11:09 +0000 (Fri, 06 Mar 2009) Log Message: ----------- fix typos in mysql and pdo extentions Modified Paths: -------------- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-03-06 06:06:59 UTC (rev 3604) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-03-06 06:11:09 UTC (rev 3605) @@ -9,4 +9,4 @@ CONFIGURE_ARGS += --with-mysql=shared,$(prefix) PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so -PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.a +PKGFILES_CSWphp5mysql += .*/lib/php/extensions/.*/mysql\.a Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-03-06 06:06:59 UTC (rev 3604) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-03-06 06:11:09 UTC (rev 3605) @@ -2,9 +2,9 @@ PACKAGES += CSWphp5pdo -CATALOGNAME_CSWphp5pdoodbc = php5_pdo -SPKG_DESC_CSWphp5pdoodbc = pdo Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 +CATALOGNAME_CSWphp5pdo = php5_pdo +SPKG_DESC_CSWphp5pdo = pdo Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdo = CSWphp5 -PKGFILES_CSWphp5pdoodbc = .*/lib/php/extensions/.*/pdo\.so -PKGFILES_CSWphp5pdoodbc += .*/lib/php/extensions/.*/pdo\.a +PKGFILES_CSWphp5pdo = .*/lib/php/extensions/.*/pdo\.so +PKGFILES_CSWphp5pdo += .*/lib/php/extensions/.*/pdo\.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Mar 6 17:36:20 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 06 Mar 2009 16:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[3606] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 3606 http://gar.svn.sourceforge.net/gar/?rev=3606&view=rev Author: idogan23 Date: 2009-03-06 16:36:20 +0000 (Fri, 06 Mar 2009) Log Message: ----------- switched completely to cswclassutils and some other small things Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend csw/mgar/pkg/unbound/trunk/files/cswunbound csw/mgar/pkg/unbound/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-03-06 06:11:09 UTC (rev 3605) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-03-06 16:36:20 UTC (rev 3606) @@ -11,10 +11,16 @@ MASTER_SITES = http://unbound.net/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWunbound, preinstall) +DISTFILES += $(call admfiles,CSWunbound, depend) +DISTFILES += cswunbound +DISTFILES += cswusergroup GARCOMPILER = GCC4 +REQUIRED_PKGS = CSWcswclassutils +SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/unbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' + # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -23,9 +29,16 @@ # UPSTREAM_MASTER_SITES = CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --without-pthreads CONFIGUTE_ARGS += --with-solaris-threads CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +post-install-modulated: + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound + @ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/unbound/cswusergroup + @mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + @chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + include gar/category.mk Added: csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend =================================================================== --- csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend (rev 0) +++ csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend 2009-03-06 16:36:20 UTC (rev 3606) @@ -0,0 +1,3 @@ +P CSWcommon +P CSWosslrt +P CSWgcc4corert Deleted: csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall =================================================================== --- csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall 2009-03-06 06:11:09 UTC (rev 3605) +++ csw/mgar/pkg/unbound/trunk/files/CSWunbound.preinstall 2009-03-06 16:36:20 UTC (rev 3606) @@ -1,18 +0,0 @@ -#!/bin/sh - -# check, if the unbound user does exist -grep '^unbound:' $PKG_ROOT_DIR/etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - getent passwd unbound >/dev/null - if [ $? -ne 0 ] ; then - NEEDUSER=1 - fi -fi - -# create the unbound user, if NEEDUSER=1 -if [ "$NEEDUSER" = 1 ] ; then - echo Adding required unbound user - - # create the amavis user - /usr/sbin/useradd -d /var/run -g other -c 'unbound pseud user' -s /bin/false unbound -fi Added: csw/mgar/pkg/unbound/trunk/files/cswunbound =================================================================== --- csw/mgar/pkg/unbound/trunk/files/cswunbound (rev 0) +++ csw/mgar/pkg/unbound/trunk/files/cswunbound 2009-03-06 16:36:20 UTC (rev 3606) @@ -0,0 +1,36 @@ +#!/bin/sh + +#RC_KNUM 72 +#RC_SNUM 72 +#RC_KLEV 0,1,S +#RC_SLEV 2 +#FMRI network + +case "$1" in + start) + echo "Starting unbound" + + if [ -x /usr/lib/extendedFILE.so.1 ]; then + ulimit -n 1024 + LD_PRELOAD_32=/usr/lib/extendedFILE.so.1 + export LD_PRELOAD_32 + fi + + /opt/csw/sbin/unbound + ;; + stop) + echo "Stopping unbound" + kill `cat /var/run/unbound.pid` && rm /var/run/unbound.pid + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac + +exit 0 Property changes on: csw/mgar/pkg/unbound/trunk/files/cswunbound ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/unbound/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/unbound/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/unbound/trunk/files/cswusergroup 2009-03-06 16:36:20 UTC (rev 3606) @@ -0,0 +1 @@ +unbound:::::: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Mar 6 17:56:05 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 06 Mar 2009 16:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3607] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 3607 http://gar.svn.sourceforge.net/gar/?rev=3607&view=rev Author: bonivart Date: 2009-03-06 16:56:03 +0000 (Fri, 06 Mar 2009) Log Message: ----------- clamav: more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2009-03-06 16:36:20 UTC (rev 3606) +++ csw/mgar/pkg/clamav/trunk/Makefile 2009-03-06 16:56:03 UTC (rev 3607) @@ -1,7 +1,4 @@ # http://www.clamav.net/snapshot/clamav-devel-latest.tar.gz -# review deps -# - remove: gmp, tcp wrappers (?) -# - add: ncurses, unrar (?) GARNAME = clamav GARVERSION = 0.95rc1 @@ -22,15 +19,15 @@ MASTER_SITES = http://www.clamav.net/snapshot/ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES = $(GARNAME)-devel-latest.tar.gz -#DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall) -DISTFILES += $(call admfiles,CSWclamav,) -DISTFILES += $(call admfiles,CSWlibclamav,) -SPKG_DESC_CSWclamav = Clam AntiVirus -SPKG_DESC_CSWlibclamav = Clam AntiVirus Library +PACKAGES = CSWclamav CSWlibclamav +CATALOGNAME_CSWclamav = clamav +SPKG_DESC_CSWclamav = $(DESCRIPTION) +CATALOGNAME_CSWlibclamav = libclamav +SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library -REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWtcpwrap -REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv +REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses +REQUIRED_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -43,7 +40,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter -CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail +# unrecognized by 0.95rc1? CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) @@ -54,6 +51,8 @@ PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* # fix usergroup stuff +## files/dirs owned by clamav user +## move cswusergroup file /opt/csw/etc/clamav/ PROTOTYPE_FILTER = awk ' \ $$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } \ $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } \ @@ -67,6 +66,8 @@ SPKG_SOURCEURL = http://www.clamav.net/ TEST_TARGET = check + +# can not run checkpkg due to libs in separate package ENABLE_CHECK=0 include gar/category.mk @@ -93,7 +94,7 @@ @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) - @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE +# @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE @ginstall -m 644 $(FILEDIR)/CSWclamav.INSTALL.clamav-milter.CSW $(DOCDEST)/INSTALL.clamav-milter.CSW @ginstall -m 644 $(FILEDIR)/CSWclamav.README.CSW $(DOCDEST)/README.CSW @ginstall -d $(DOCDEST)/contrib @@ -102,6 +103,6 @@ @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib @ginstall -d $(DOCDEST)/html @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html - @ginstall -d $(DESTDIR)$(docdir)/libclamav - @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/libclamav/LICENSE +# @ginstall -d $(DESTDIR)$(docdir)/libclamav +# @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/libclamav/LICENSE @$(MAKECOOKIE) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2009-03-06 16:36:20 UTC (rev 3606) +++ csw/mgar/pkg/clamav/trunk/checksums 2009-03-06 16:56:03 UTC (rev 3607) @@ -1,3 +1 @@ -9ae62dd70ac3dabd775c2c9cba7cfd73 download/clamav-devel-latest.tar.gz -dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec -8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec +2c7c582b6182353dfdd25931c80bc781 download/clamav-devel-latest.tar.gz Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2009-03-06 16:36:20 UTC (rev 3606) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2009-03-06 16:56:03 UTC (rev 3607) @@ -1,56 +0,0 @@ -# checkinstall script for Clamav -# Verify that group and user clamav exists -# 2008-12-10 Peter Bonivart - -ADDUSER=0 -ADDGROUP=0 -# Next, verify that group clamav exists. -# First check target machines group file, THEN check -# NIS/NIS+/whatever - -/usr/bin/grep '^clamav:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent group clamav >/dev/null - if [ $? -ne 0 ] ; then - NEEDGROUP=1 - fi -fi - -if [ "$NEEDGROUP" = 1 ] ; then - echo "***" - echo "Group clamav must exist for this package install." - echo "clamav group will be added." - ADDGROUP=1 -else - echo "clamav group detected" -fi -# Next, verify that user clamav exists. -# First check target machines password file, THEN check -# NIS/NIS+/whatever - -/usr/bin/grep '^clamav:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent passwd clamav >/dev/null - if [ $? -ne 0 ] ; then - NEEDUSER=1 - fi -fi - -if [ "$NEEDUSER" = 1 ] ; then - echo "***" - echo "User clamav must exist for this package install." - echo "clamav user will be added." - ADDUSER=1 -else - echo "clamav user detected" -fi - -# Make env variables available to other packaging scripts - -cat >$1 < Hi all, I was trying to build a package with SMF support (the old style, without cswclassutils). During the packaging phase I got the following errors: ## Building pkgmap from package prototype file. ERROR in /home/ja/tmp/nrpe/trunk/work/build-global/CSWnrpe.prototype-sparc: no object for <$WORKDIR_FIRSTMOD/nrpe> found in root directory no object for <$WORKDIR_FIRSTMOD/nrpe.xml> found in root directory no object for <$WORKDIR_FIRSTMOD/svc-nrpe> found in root directory pkgmk: ERROR: unable to build pkgmap from prototype file ## Packaging was not successful. It turned out, that this happends with packages checked out in the very last few days. Building the same (and identical) package, checked out earlier, is no problem. Could anyone give me a hint? Maybe a typo in gar? Or did I miss something? Thanks! -- Juergen Arndt From skayser at users.sourceforge.net Sat Mar 7 01:49:10 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 07 Mar 2009 00:49:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[3608] csw/mgar/pkg/watch/trunk Message-ID: Revision: 3608 http://gar.svn.sourceforge.net/gar/?rev=3608&view=rev Author: skayser Date: 2009-03-07 00:49:09 +0000 (Sat, 07 Mar 2009) Log Message: ----------- watch: fixed broken pipe errors Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/checksums Added Paths: ----------- csw/mgar/pkg/watch/trunk/files/patch-sigpipe.diff Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2009-03-06 16:56:03 UTC (rev 3607) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-03-07 00:49:09 UTC (rev 3608) @@ -1,13 +1,9 @@ -# Todo: -# * watch called for programs with longer than terminal output -# (for example "find ." or "ls -lR" or "last" on build8x) causes -# broken pipe on second program invocation GARNAME = watch GARVERSION = 3.2.7 CATEGORIES = utils DESCRIPTION = Watch a program output change over time -define Blurb +define BLURB "watch" from the procps package. endef @@ -16,20 +12,25 @@ SF_PROJ = procps MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz -PATCHFILES = patch-extralibs.diff DISTNAME = $(SF_PROJ)-$(GARVERSION) REQUIRED_PKGS = CSWncurses -CONFIGURE_ARGS = $(DIRPATHS) - -EXTRA_INC = /opt/csw/include/ncurses - TEST_SCRIPTS = CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom +# Include additional libraries (see pre-build-modulated below) +PATCHFILES = patch-extralibs.diff + +# Avoid "Broken pipe" error message on pclose() for cmds with longish output +PATCHFILES += patch-sigpipe.diff + +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_INC = /opt/csw/include/ncurses + include gar/category.mk # procps is heavily GNU tailored, so we need to make some adjustments Modified: csw/mgar/pkg/watch/trunk/checksums =================================================================== --- csw/mgar/pkg/watch/trunk/checksums 2009-03-06 16:56:03 UTC (rev 3607) +++ csw/mgar/pkg/watch/trunk/checksums 2009-03-07 00:49:09 UTC (rev 3608) @@ -1,2 +1,3 @@ f490bca772b16472962c7b9f23b1e97d download/procps-3.2.7.tar.gz 05f5e9e304c4300b056ffd61eafebffa download/patch-extralibs.diff +c29461ef280f8a7dca7ef1d5aeec8e2d download/patch-sigpipe.diff Added: csw/mgar/pkg/watch/trunk/files/patch-sigpipe.diff =================================================================== --- csw/mgar/pkg/watch/trunk/files/patch-sigpipe.diff (rev 0) +++ csw/mgar/pkg/watch/trunk/files/patch-sigpipe.diff 2009-03-07 00:49:09 UTC (rev 3608) @@ -0,0 +1,13 @@ +--- procps-3.2.7.orig/watch.c 2009-03-07 01:23:35.904690072 +0100 ++++ procps-3.2.7/watch.c 2009-03-07 01:30:41.534474183 +0100 +@@ -313,6 +314,10 @@ + oldeolseen = eolseen; + } + ++ /* Finish reading from pipe to avoid SIGPIPE for the child */ ++ char devnull[8192]; ++ while (fgets(devnull, 8192, p) != NULL) {;} ++ + pclose(p); + + first_screen = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Mar 7 02:05:48 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 07 Mar 2009 01:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3609] csw/mgar/pkg/watch/trunk/Makefile Message-ID: Revision: 3609 http://gar.svn.sourceforge.net/gar/?rev=3609&view=rev Author: skayser Date: 2009-03-07 01:05:48 +0000 (Sat, 07 Mar 2009) Log Message: ----------- watch: adjusted version number Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2009-03-07 00:49:09 UTC (rev 3608) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-03-07 01:05:48 UTC (rev 3609) @@ -1,5 +1,5 @@ GARNAME = watch -GARVERSION = 3.2.7 +GARVERSION = 0.2.0 CATEGORIES = utils DESCRIPTION = Watch a program output change over time @@ -10,9 +10,10 @@ # Usually we would use $(SF_MIRROR), but the procps folks didn't upload # procps the usual way SF_PROJ = procps +SF_PROJ_VER = 3.2.7 MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz -DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz +DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) REQUIRED_PKGS = CSWncurses This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Mar 7 12:04:22 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 07 Mar 2009 11:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[3610] csw/mgar/pkg Message-ID: Revision: 3610 http://gar.svn.sourceforge.net/gar/?rev=3610&view=rev Author: idogan23 Date: 2009-03-07 11:04:22 +0000 (Sat, 07 Mar 2009) Log Message: ----------- nsd: initial commit Added Paths: ----------- csw/mgar/pkg/nsd/ csw/mgar/pkg/nsd/branches/ csw/mgar/pkg/nsd/tags/ csw/mgar/pkg/nsd/trunk/ csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/files/ csw/mgar/pkg/nsd/trunk/files/CSWnsd.gspec Property changes on: csw/mgar/pkg/nsd/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nsd/trunk/Makefile 2009-03-07 11:04:22 UTC (rev 3610) @@ -0,0 +1,25 @@ +GARNAME = nsd +GARVERSION = 3.2.1 +CATEGORIES = server + +DESCRIPTION = An authoritative only non-recursive name server +define BLURB + NSD (Name Server Daemon) is a complete implementation of an + authoritative DNS nameserver. +endef + +MASTER_SITES = http://www.nlnetlabs.nl/downloads/nsd/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWnsd,) + +# We define upstream file regex so we can be notifed of new upstream software release +#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl=/opt/csw + +include gar/category.mk Added: csw/mgar/pkg/nsd/trunk/files/CSWnsd.gspec =================================================================== --- csw/mgar/pkg/nsd/trunk/files/CSWnsd.gspec (rev 0) +++ csw/mgar/pkg/nsd/trunk/files/CSWnsd.gspec 2009-03-07 11:04:22 UTC (rev 3610) @@ -0,0 +1,4 @@ +%var bitname nsd +%var pkgname CSWnsd +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Mar 7 16:57:06 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 Mar 2009 15:57:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3611] csw/mgar/pkg Message-ID: Revision: 3611 http://gar.svn.sourceforge.net/gar/?rev=3611&view=rev Author: rthurner Date: 2009-03-07 15:57:06 +0000 (Sat, 07 Mar 2009) Log Message: ----------- initial dir structure for mod_wsgi Added Paths: ----------- csw/mgar/pkg/branches/ csw/mgar/pkg/tags/ csw/mgar/pkg/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Mar 7 17:05:49 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 Mar 2009 16:05:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[3612] csw/mgar/pkg/mod_wsgi/ Message-ID: Revision: 3612 http://gar.svn.sourceforge.net/gar/?rev=3612&view=rev Author: rthurner Date: 2009-03-07 16:05:47 +0000 (Sat, 07 Mar 2009) Log Message: ----------- create dir by hand to correct wrong import Added Paths: ----------- csw/mgar/pkg/mod_wsgi/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Mar 7 17:08:34 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 Mar 2009 16:08:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3613] csw/mgar/pkg Message-ID: Revision: 3613 http://gar.svn.sourceforge.net/gar/?rev=3613&view=rev Author: rthurner Date: 2009-03-07 16:08:33 +0000 (Sat, 07 Mar 2009) Log Message: ----------- wrongly created Removed Paths: ------------- csw/mgar/pkg/branches/ csw/mgar/pkg/tags/ csw/mgar/pkg/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Mar 7 17:13:54 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 Mar 2009 16:13:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[3614] csw/mgar/pkg/mod_wsgi Message-ID: Revision: 3614 http://gar.svn.sourceforge.net/gar/?rev=3614&view=rev Author: rthurner Date: 2009-03-07 16:13:49 +0000 (Sat, 07 Mar 2009) Log Message: ----------- set basic structure + properties Added Paths: ----------- csw/mgar/pkg/mod_wsgi/branches/ csw/mgar/pkg/mod_wsgi/tags/ csw/mgar/pkg/mod_wsgi/trunk/ Property changes on: csw/mgar/pkg/mod_wsgi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Mar 7 17:19:44 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 Mar 2009 16:19:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[3615] csw/mgar/pkg/mod_wsgi/trunk Message-ID: Revision: 3615 http://gar.svn.sourceforge.net/gar/?rev=3615&view=rev Author: rthurner Date: 2009-03-07 16:19:30 +0000 (Sat, 07 Mar 2009) Log Message: ----------- initial files, copied from mod_python Added Paths: ----------- csw/mgar/pkg/mod_wsgi/trunk/Makefile csw/mgar/pkg/mod_wsgi/trunk/checksums csw/mgar/pkg/mod_wsgi/trunk/files/ csw/mgar/pkg/mod_wsgi/trunk/files/postinstall csw/mgar/pkg/mod_wsgi/trunk/files/preremove csw/mgar/pkg/mod_wsgi/trunk/files/space Added: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-03-07 16:19:30 UTC (rev 3615) @@ -0,0 +1,38 @@ +GARNAME = mod_wsgi +GARVERSION = 2.3 +CATEGORIES = lib + +DESCRIPTION = an Apache/Python WSGI adapter module +define BLURB + Mod_wsgi is a python WSGI adapter module for Apache. +endef + +MASTER_SITES = http://code.google.com/p/modwsgi +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += postinstall preremove space + +PACKAGES = CSWap2modwsgi + +REQUIRED_PKGS_CSWap2modwsgi = CSWap2prefork CSWpython +CATALOGNAME_CSWap2modwsgi = ap2_modwsgi +SPKG_DESC_CSWap2modwsgi = an Apache/Python WSGI adapter module + +#PATCHFILES = configure.diff +#PATCHFILES += connobject.diff + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += --with-python=$(bindir)/python +CONFIGURE_ARGS += --with-python-src=../python + +## There are no tests for this +TEST_SCRIPTS = skip + +test-skip: + $(DONADA) + +include gar/category.mk + Added: csw/mgar/pkg/mod_wsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/checksums (rev 0) +++ csw/mgar/pkg/mod_wsgi/trunk/checksums 2009-03-07 16:19:30 UTC (rev 3615) @@ -0,0 +1,4 @@ +c686e1c498dbe5753fe491c3cf61cff4 download/mod_wsgi-2.3.tar.gz +a2e8679f45232e56efbc352597ffe456 download/postinstall +a67766841dedbaba0d7b15e7f08c8658 download/preremove +0dd379f20ceb32fc77bb3a9bf045097f download/space Added: csw/mgar/pkg/mod_wsgi/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/files/postinstall (rev 0) +++ csw/mgar/pkg/mod_wsgi/trunk/files/postinstall 2009-03-07 16:19:30 UTC (rev 3615) @@ -0,0 +1,24 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +# Enable the wsgi module +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} +chroot $PKG_INSTALL_ROOT \ + $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n wsgi mod_wsgi.so + +# Finito +cat < Revision: 3616 http://gar.svn.sourceforge.net/gar/?rev=3616&view=rev Author: rthurner Date: 2009-03-07 17:10:09 +0000 (Sat, 07 Mar 2009) Log Message: ----------- workaround for a few days, until mike's new python is live Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-03-07 16:19:30 UTC (rev 3615) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-03-07 17:10:09 UTC (rev 3616) @@ -34,5 +34,10 @@ test-skip: $(DONADA) +## Fix Makefile LDFLAGS to correct broken python-config return values +post-configure-modulated: + @( perl -i -plne 's|^LDFLAGS = .*|LDFLAGS = -L/opt/csw/lib|' \ + $(WORKSRC)/Makefile ) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Mar 7 20:17:20 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 07 Mar 2009 19:17:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[3617] csw/mgar/pkg/freeciv/trunk Message-ID: Revision: 3617 http://gar.svn.sourceforge.net/gar/?rev=3617&view=rev Author: jake_goerzen Date: 2009-03-07 19:17:20 +0000 (Sat, 07 Mar 2009) Log Message: ----------- update depend file with CSWggettextrt instead of CSWggettext Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/checksums csw/mgar/pkg/freeciv/trunk/files/CSWfreeciv.depend Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2009-03-07 17:10:09 UTC (rev 3616) +++ csw/mgar/pkg/freeciv/trunk/checksums 2009-03-07 19:17:20 UTC (rev 3617) @@ -1,5 +1,5 @@ 3e9925e868a816c1fba58993cced92ef download/freeciv-2.1.8.tar.gz 4f6b34dbb2143663d82ebea710c56863 download/CSWfreeciv.gspec -8b2248c58bd3ed3d7ce1fb5274f0b0f7 download/CSWfreeciv.depend +fee60b5af7c882c2eb16a8ca622e3958 download/CSWfreeciv.depend d3acfde4316e7011beccd69b21d2ad67 download/CSWfreeciv.prototype 892be308fb8a4e34f0e98083de3e1788 download/dataio.c.diff Modified: csw/mgar/pkg/freeciv/trunk/files/CSWfreeciv.depend =================================================================== --- csw/mgar/pkg/freeciv/trunk/files/CSWfreeciv.depend 2009-03-07 17:10:09 UTC (rev 3616) +++ csw/mgar/pkg/freeciv/trunk/files/CSWfreeciv.depend 2009-03-07 19:17:20 UTC (rev 3617) @@ -7,7 +7,7 @@ P CSWlibcairo P CSWesound P CSWiconv -P CSWggettext +P CSWggettextrt P CSWpango P CSWreadline P CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Mar 7 20:50:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 07 Mar 2009 19:50:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[3618] csw/mgar/pkg Message-ID: Revision: 3618 http://gar.svn.sourceforge.net/gar/?rev=3618&view=rev Author: skayser Date: 2009-03-07 19:50:11 +0000 (Sat, 07 Mar 2009) Log Message: ----------- nano: Initial commit Added Paths: ----------- csw/mgar/pkg/nano/ csw/mgar/pkg/nano/branches/ csw/mgar/pkg/nano/tags/ csw/mgar/pkg/nano/trunk/ csw/mgar/pkg/nano/trunk/Makefile csw/mgar/pkg/nano/trunk/checksums csw/mgar/pkg/nano/trunk/files/ csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall csw/mgar/pkg/nano/trunk/files/CSWnano.postremove Property changes on: csw/mgar/pkg/nano/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/nano/trunk/Makefile =================================================================== --- csw/mgar/pkg/nano/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nano/trunk/Makefile 2009-03-07 19:50:11 UTC (rev 3618) @@ -0,0 +1,32 @@ +GARNAME = nano +GARVERSION = 2.0.9 +CATEGORIES = utils + +DESCRIPTION = Enhanced clone of the Pico text editor +define BLURB +GNU nano is designed to be a free replacement for the Pico text editor, part of +the Pine email suite from The University of Washington. It aims to "emulate +Pico as closely as possible and perhaps include extra functionality". +endef + +MASTER_SITES = http://www.nano-editor.org/dist/v2.0/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = CSWnano.postinstall CSWnano.postremove + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWggettextrt CSWncurses + +EXTRA_INC = /opt/csw/include/ncurses + +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-all + +# Disable automatic line wraps when running as root. See +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513443 for +# some background info +CONFIGURE_ARGS += --disable-wrapping-as-root + +include gar/category.mk Added: csw/mgar/pkg/nano/trunk/checksums =================================================================== --- csw/mgar/pkg/nano/trunk/checksums (rev 0) +++ csw/mgar/pkg/nano/trunk/checksums 2009-03-07 19:50:11 UTC (rev 3618) @@ -0,0 +1,2 @@ +c1bfcb567c7a645b5c4f5130158d7808 download/CSWnano.postinstall +46649817cd38cea9fb6fb8c201f7f227 download/CSWnano.postremove Added: csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall =================================================================== --- csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall (rev 0) +++ csw/mgar/pkg/nano/trunk/files/CSWnano.postinstall 2009-03-07 19:50:11 UTC (rev 3618) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# postinstall - this script is executed after the CVS PKG install +# +# This script updates the info dir file for textinfo + +if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi +if [ ! -x "$PKG_ROOT_DIR/opt/csw/sbin/mkdirentries" ] ; then exit 0; fi + +savepath=$PATH +PATH=/usr/bin:/opt/csw/bin + +echo "Updating the info dir file for CSWtexinfo" +/usr/sbin/chroot $PKG_ROOT_DIR /opt/csw/sbin/mkdirentries + +PATH=$savepath + +exit 0 Added: csw/mgar/pkg/nano/trunk/files/CSWnano.postremove =================================================================== --- csw/mgar/pkg/nano/trunk/files/CSWnano.postremove (rev 0) +++ csw/mgar/pkg/nano/trunk/files/CSWnano.postremove 2009-03-07 19:50:11 UTC (rev 3618) @@ -0,0 +1,16 @@ +# postremove - this script is executed after the CVS PKG remove +# +# This script updates the info dir file for textinfo + +if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi +if [ ! -x "$PKG_ROOT_DIR/opt/csw/sbin/mkdirentries" ] ; then exit 0; fi + +savepath=$PATH +PATH=/usr/bin:/opt/csw/bin + +echo "Updating the info dir file for CSWtexinfo" +/usr/sbin/chroot $PKG_ROOT_DIR /opt/csw/sbin/mkdirentries + +PATH=savepath + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Mar 7 22:50:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 07 Mar 2009 21:50:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3619] csw/mgar/pkg/java Message-ID: Revision: 3619 http://gar.svn.sourceforge.net/gar/?rev=3619&view=rev Author: wbonnet Date: 2009-03-07 21:50:16 +0000 (Sat, 07 Mar 2009) Log Message: ----------- Add Apache Jakarta Configuration to GAR Added Paths: ----------- csw/mgar/pkg/java/ajcconfig/ csw/mgar/pkg/java/ajcconfig/branches/ csw/mgar/pkg/java/ajcconfig/tags/ csw/mgar/pkg/java/ajcconfig/trunk/ csw/mgar/pkg/java/ajcconfig/trunk/Makefile csw/mgar/pkg/java/ajcconfig/trunk/checksums csw/mgar/pkg/java/ajcconfig/trunk/files/ csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec Property changes on: csw/mgar/pkg/java/ajcconfig/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/java/ajcconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/Makefile (rev 0) +++ csw/mgar/pkg/java/ajcconfig/trunk/Makefile 2009-03-07 21:50:16 UTC (rev 3619) @@ -0,0 +1,54 @@ +SHORTNAME = configuration +GARVERSION = 1.6 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons Configuration +define BLURB +Apache Jakarta Commons Configuration : Tools to assist in the reading of configuration files +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcconfig,) +DISTFILES += $(call admfiles,CSWajcconfigdoc,) + +# Defines package description +SPKG_DESC_CSWajcconfig = $(DESCRIPTION) +SPKG_DESC_CSWajcconfigdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcconfig = CSWajclang CSWajclogging CSWajclang CSWajcdigester CSWajccollect CSWajcbeanutils + +# Defines package content +PKGFILES_CSWajcconfig = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcconfig += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/java/ajcconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/checksums (rev 0) +++ csw/mgar/pkg/java/ajcconfig/trunk/checksums 2009-03-07 21:50:16 UTC (rev 3619) @@ -0,0 +1,3 @@ +66c6398a0ad99d181e9ea388f9c25c93 download/commons-configuration-1.6.tar.gz +b737cf3fc3d7036107fbaa6ced028382 download/CSWajcconfig.gspec +72c82e8a1546c7163cc5f0da4724e4fd download/CSWajcconfigdoc.gspec Added: csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec (rev 0) +++ csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec 2009-03-07 21:50:16 UTC (rev 3619) @@ -0,0 +1,7 @@ +%var bitname commons_config +%var pkgname CSWajcconfig +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/${GARNAME}/License.txt for license information Added: csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec (rev 0) +++ csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec 2009-03-07 21:50:16 UTC (rev 3619) @@ -0,0 +1,7 @@ +%var bitname commons_config_doc +%var pkgname CSWajcconfigdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/${GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Mar 7 23:00:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 07 Mar 2009 22:00:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3620] csw/mgar/pkg/java/ajcconfig/Makefile Message-ID: Revision: 3620 http://gar.svn.sourceforge.net/gar/?rev=3620&view=rev Author: wbonnet Date: 2009-03-07 22:00:32 +0000 (Sat, 07 Mar 2009) Log Message: ----------- Add Apache Jakarta Configuration to GAR Added Paths: ----------- csw/mgar/pkg/java/ajcconfig/Makefile Added: csw/mgar/pkg/java/ajcconfig/Makefile =================================================================== --- csw/mgar/pkg/java/ajcconfig/Makefile (rev 0) +++ csw/mgar/pkg/java/ajcconfig/Makefile 2009-03-07 22:00:32 UTC (rev 3620) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 7 23:37:25 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 07 Mar 2009 22:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3621] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 3621 http://gar.svn.sourceforge.net/gar/?rev=3621&view=rev Author: hson Date: 2009-03-07 22:37:25 +0000 (Sat, 07 Mar 2009) Log Message: ----------- wmf: Upstream check fix Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2009-03-07 22:00:32 UTC (rev 3620) +++ csw/mgar/pkg/wmf/trunk/Makefile 2009-03-07 22:37:25 UTC (rev 3621) @@ -24,7 +24,9 @@ REQUIRED_PKGS += CSWpng CSWzlib # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10501 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 7 23:50:14 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 07 Mar 2009 22:50:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[3622] csw/mgar/pkg Message-ID: Revision: 3622 http://gar.svn.sourceforge.net/gar/?rev=3622&view=rev Author: hson Date: 2009-03-07 22:50:14 +0000 (Sat, 07 Mar 2009) Log Message: ----------- netsnmp: Intial commit Added Paths: ----------- csw/mgar/pkg/netsnmp/ csw/mgar/pkg/netsnmp/branches/ csw/mgar/pkg/netsnmp/tags/ csw/mgar/pkg/netsnmp/trunk/ csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums csw/mgar/pkg/netsnmp/trunk/files/ Property changes on: csw/mgar/pkg/netsnmp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2009-03-07 22:50:14 UTC (rev 3622) @@ -0,0 +1,43 @@ +GARNAME = netsnmp +GARVERSION = 5.4.2.1 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +SF_PROJ = net-snmp +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz + +DISTNAME = $(SF_PROJ)-$(GARVERSION) + +SPKG_SOURCEURL = http://www.net-snmp.org/ + +REQUIRED_PKGS += CSWosslrt CSWtcpwrap + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-default-snmp-version=1 +CONFIGURE_ARGS += --with-sys-contact=unknown +CONFIGURE_ARGS += --with-sys-location=unknown +CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log +CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp +CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio ucd-snmp/lmSensors agentx mibII/mta_sendmail' +CONFIGURE_ARGS += '--with-libwrap=/opt/csw/lib' +CONFIGURE_ARGS += '--enable-ipv6' +CONFIGURE_ARGS += '--with-transports=UDP TCP Unix' +CONFIGURE_ARGS += '--with-perl-mod' + +EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod + +include gar/category.mk Added: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums (rev 0) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2009-03-07 22:50:14 UTC (rev 3622) @@ -0,0 +1 @@ +984932520143f0c8bf7b7ce1fc9e1da1 download/net-snmp-5.4.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 8 00:57:29 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 07 Mar 2009 23:57:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[3623] csw/mgar/pkg Message-ID: Revision: 3623 http://gar.svn.sourceforge.net/gar/?rev=3623&view=rev Author: bonivart Date: 2009-03-07 23:57:29 +0000 (Sat, 07 Mar 2009) Log Message: ----------- lzop: initial commit Added Paths: ----------- csw/mgar/pkg/lzop/ csw/mgar/pkg/lzop/branches/ csw/mgar/pkg/lzop/tags/ csw/mgar/pkg/lzop/trunk/ csw/mgar/pkg/lzop/trunk/Makefile csw/mgar/pkg/lzop/trunk/checksums csw/mgar/pkg/lzop/trunk/files/ Property changes on: csw/mgar/pkg/lzop/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lzop/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lzop/trunk/Makefile 2009-03-07 23:57:29 UTC (rev 3623) @@ -0,0 +1,30 @@ +GARNAME = lzop +GARVERSION = 1.02rc1 +CATEGORIES = utils + +DESCRIPTION = LZO file compressor +define BLURB + lzop is a file compressor which is very similar to gzip. lzop uses the LZO data + compression library for compression services, and its main advantages over gzip are + much higher compression and decompression speed (at the cost of some compression + ratio). +endef + +MASTER_SITES = http://www.lzop.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWlzop +CATALOGNAME = lzop +SPKG_DESC = $(DESCRIPTION) +SPKG_SOURCEURL = http://www.lzop.org + +REQUIRED_PKGS = CSWlzo + +# We define upstream file regex so we can be notifed of new upstream software release +#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +TEST_TARGET = check + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/lzop/trunk/checksums =================================================================== --- csw/mgar/pkg/lzop/trunk/checksums (rev 0) +++ csw/mgar/pkg/lzop/trunk/checksums 2009-03-07 23:57:29 UTC (rev 3623) @@ -0,0 +1 @@ +4b999030716b1353c3dac049b269df7a download/lzop-1.02rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 8 01:39:25 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 08 Mar 2009 00:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3624] csw/mgar/pkg/lzop/trunk/Makefile Message-ID: Revision: 3624 http://gar.svn.sourceforge.net/gar/?rev=3624&view=rev Author: bonivart Date: 2009-03-08 00:39:25 +0000 (Sun, 08 Mar 2009) Log Message: ----------- lzop: added docs Modified Paths: -------------- csw/mgar/pkg/lzop/trunk/Makefile Modified: csw/mgar/pkg/lzop/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzop/trunk/Makefile 2009-03-07 23:57:29 UTC (rev 3623) +++ csw/mgar/pkg/lzop/trunk/Makefile 2009-03-08 00:39:25 UTC (rev 3624) @@ -21,10 +21,19 @@ REQUIRED_PKGS = CSWlzo # We define upstream file regex so we can be notifed of new upstream software release -#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk + +DOCS = AUTHORS NEWS README THANKS doc/magic +DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) + +post-install-modulated: + @echo " ==> Post-install for $(GARNAME) (custom)" + @ginstall -d $(DOCDEST) + @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 8 02:55:31 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 08 Mar 2009 01:55:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3625] csw/mgar/pkg Message-ID: Revision: 3625 http://gar.svn.sourceforge.net/gar/?rev=3625&view=rev Author: hson Date: 2009-03-08 01:55:31 +0000 (Sun, 08 Mar 2009) Log Message: ----------- libnids: Initial commit Added Paths: ----------- csw/mgar/pkg/libnids/ csw/mgar/pkg/libnids/branches/ csw/mgar/pkg/libnids/tags/ csw/mgar/pkg/libnids/trunk/ csw/mgar/pkg/libnids/trunk/Makefile csw/mgar/pkg/libnids/trunk/checksums csw/mgar/pkg/libnids/trunk/files/ csw/mgar/pkg/libnids/trunk/files/mainpatch Property changes on: csw/mgar/pkg/libnids/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libnids/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnids/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libnids/trunk/Makefile 2009-03-08 01:55:31 UTC (rev 3625) @@ -0,0 +1,36 @@ +GARNAME = libnids +GARVERSION = 1.23 +CATEGORIES = net + +DESCRIPTION = implementation of an e-component of network intrusion detection +define BLURB + Long description +endef + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://libnids.sourceforge.net/ + +REQUIRED_PKGS += CSWggettextrt CSWglib2 CSWlibnet CSWlibpcap + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=92215 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +#GARCOMPILER = GCC3 + +PATCHFILES = mainpatch + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/libnids/trunk/checksums =================================================================== --- csw/mgar/pkg/libnids/trunk/checksums (rev 0) +++ csw/mgar/pkg/libnids/trunk/checksums 2009-03-08 01:55:31 UTC (rev 3625) @@ -0,0 +1,2 @@ +af35e8ef403a0ca95df2da94db856428 download/libnids-1.23.tar.gz +6caaa001bda6528aa6bb464de550b023 download/mainpatch Added: csw/mgar/pkg/libnids/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/mainpatch (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-08 01:55:31 UTC (rev 3625) @@ -0,0 +1,87 @@ +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/Makefile.in libnids-1.23/src/Makefile.in +--- libnids-1.23.orig/src/Makefile.in 2008-02-21 11:40:19.000000000 +0100 ++++ libnids-1.23/src/Makefile.in 2009-03-08 02:30:29.000000000 +0100 +@@ -16,7 +16,7 @@ + LIBSHARED = libnids.so.1.23 + + CC = @CC@ +-CFLAGS = @CFLAGS@ -W -Wall -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ ++CFLAGS = @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ + LDFLAGS = @LDFLAGS@ + + PCAP_CFLAGS = @PCAP_CFLAGS@ +@@ -40,43 +40,43 @@ + # How to write the following rules compactly and portably ? + # gmake accepts "%_pic.o: %.c", bsd make does not. + checksum_pic.o: checksum.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c checksum.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c checksum.c -o $@ + ip_fragment_pic.o: ip_fragment.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_fragment.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_fragment.c -o $@ + ip_options_pic.o: ip_options.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_options.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_options.c -o $@ + killtcp_pic.o: killtcp.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c killtcp.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c killtcp.c -o $@ + libnids_pic.o: libnids.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c libnids.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c libnids.c -o $@ + scan_pic.o: scan.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c scan.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c scan.c -o $@ + tcp_pic.o: tcp.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c tcp.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c tcp.c -o $@ + util_pic.o: util.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c util.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c util.c -o $@ + allpromisc_pic.o: allpromisc.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c allpromisc.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c allpromisc.c -o $@ + hash_pic.o: hash.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c hash.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c hash.c -o $@ + + + $(LIBSTATIC): $(OBJS) + ar -cr $@ $(OBJS) + $(RANLIB) $@ + $(LIBSHARED): $(OBJS_SHARED) +- $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) ++ $(LD) -G -h $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) + + _install install: $(LIBSTATIC) +- ../mkinstalldirs $(install_prefix)$(libdir) +- ../mkinstalldirs $(install_prefix)$(includedir) +- ../mkinstalldirs $(install_prefix)$(mandir)/man3 +- $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir) +- $(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir) +- $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3 ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir) ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(includedir) ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(mandir)/man3 ++ $(INSTALL) -c -m 644 libnids.a $(DESTDIR)$(install_prefix)$(libdir) ++ $(INSTALL) -c -m 644 nids.h $(DESTDIR)$(install_prefix)$(includedir) ++ $(INSTALL) -c -m 644 libnids.3 $(DESTDIR)$(install_prefix)$(mandir)/man3 + _installshared installshared: install $(LIBSHARED) +- $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir) +- ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so ++ $(INSTALL) -c -m 755 $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir) ++ ln -s -f $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir)/libnids.so + + clean: + rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/ip_options.c libnids-1.23/src/ip_options.c +--- libnids-1.23.orig/src/ip_options.c 2002-08-10 21:07:45.000000000 +0200 ++++ libnids-1.23/src/ip_options.c 2009-03-08 02:18:44.000000000 +0100 +@@ -69,7 +69,7 @@ + unsigned char __pad1; + unsigned char __pad2; + unsigned char __pad3; +- unsigned char __data[0]; ++ unsigned char __data[]; + }; + + struct iphdr { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 8 04:40:58 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 08 Mar 2009 03:40:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3626] csw/mgar/pkg Message-ID: Revision: 3626 http://gar.svn.sourceforge.net/gar/?rev=3626&view=rev Author: hson Date: 2009-03-08 03:40:58 +0000 (Sun, 08 Mar 2009) Log Message: ----------- pwgen: Initial commit Added Paths: ----------- csw/mgar/pkg/pwgen/ csw/mgar/pkg/pwgen/branches/ csw/mgar/pkg/pwgen/tags/ csw/mgar/pkg/pwgen/trunk/ csw/mgar/pkg/pwgen/trunk/Makefile csw/mgar/pkg/pwgen/trunk/checksums csw/mgar/pkg/pwgen/trunk/files/ csw/mgar/pkg/pwgen/trunk/files/LICENSE csw/mgar/pkg/pwgen/trunk/files/mainpatch Property changes on: csw/mgar/pkg/pwgen/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pwgen/trunk/Makefile =================================================================== --- csw/mgar/pkg/pwgen/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pwgen/trunk/Makefile 2009-03-08 03:40:58 UTC (rev 3626) @@ -0,0 +1,43 @@ +GARNAME = pwgen +GARVERSION = 2.06 +CATEGORIES = apps + +DESCRIPTION = pwgen generates passwords which can be easily memorized by a human +define BLURB + Pwgen is a small, GPL'ed password generator which creates passwords which can + be easily memorized by a human. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://pwgen.sourceforge.net + +LICENSE = LICENSE + +#REQUIRED_PKGS = CSWggettextrt CSWiconv + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=28391 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PATCHFILES = mainpatch + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + +post-extract: + ( cp $(FILEDIR)/LICENSE $(WORKSRC) ) + @$(MAKECOOKIE) + +#post-extract-$(MODULATION): +# ( cp $(FILEDIR)/LICENSE $(WORKSRC_FIRSTMOD) ) +# @$(MAKECOOKIE) Added: csw/mgar/pkg/pwgen/trunk/checksums =================================================================== --- csw/mgar/pkg/pwgen/trunk/checksums (rev 0) +++ csw/mgar/pkg/pwgen/trunk/checksums 2009-03-08 03:40:58 UTC (rev 3626) @@ -0,0 +1,2 @@ +935aebcbe610fbc9de8125e7b7d71297 download/pwgen-2.06.tar.gz +7bea97e8320feb19cc47a6bcae5512fc download/mainpatch Added: csw/mgar/pkg/pwgen/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/pwgen/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/pwgen/trunk/files/LICENSE 2009-03-08 03:40:58 UTC (rev 3626) @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307 USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! Added: csw/mgar/pkg/pwgen/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/pwgen/trunk/files/mainpatch (rev 0) +++ csw/mgar/pkg/pwgen/trunk/files/mainpatch 2009-03-08 03:40:58 UTC (rev 3626) @@ -0,0 +1,17 @@ +Only in pwgen-2.06.orig: LICENSE +diff --speed-large-files --minimal -ru pwgen-2.06.orig/Makefile.in pwgen-2.06/Makefile.in +--- pwgen-2.06.orig/Makefile.in 2007-07-05 01:42:19.000000000 +0200 ++++ pwgen-2.06/Makefile.in 2009-03-08 04:26:31.009559067 +0100 +@@ -11,9 +11,9 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + +-WALL_OPTS = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes \ +- -Wshadow -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align \ +- -pedantic ++#WALL_OPTS = -Wall -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes \ ++# -Wshadow -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align \ ++# -pedantic + CC = @CC@ + DEFS = @DEFS@ + CFLAGS = @CFLAGS@ $(WALL_OPTS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 10:21:24 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 09:21:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[3627] csw/mgar/pkg/java/ajcconfig/trunk Message-ID: Revision: 3627 http://gar.svn.sourceforge.net/gar/?rev=3627&view=rev Author: wbonnet Date: 2009-03-08 09:21:24 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Fix license path Modified Paths: -------------- csw/mgar/pkg/java/ajcconfig/trunk/checksums csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec Modified: csw/mgar/pkg/java/ajcconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/checksums 2009-03-08 03:40:58 UTC (rev 3626) +++ csw/mgar/pkg/java/ajcconfig/trunk/checksums 2009-03-08 09:21:24 UTC (rev 3627) @@ -1,3 +1,3 @@ 66c6398a0ad99d181e9ea388f9c25c93 download/commons-configuration-1.6.tar.gz -b737cf3fc3d7036107fbaa6ced028382 download/CSWajcconfig.gspec -72c82e8a1546c7163cc5f0da4724e4fd download/CSWajcconfigdoc.gspec +8e08b7110cc0cf98239740d97c462add download/CSWajcconfig.gspec +34ac42a05d3428b5629e2b6e10cc5d59 download/CSWajcconfigdoc.gspec Modified: csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec 2009-03-08 03:40:58 UTC (rev 3626) +++ csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfig.gspec 2009-03-08 09:21:24 UTC (rev 3627) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/${GARNAME}/License.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Modified: csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec 2009-03-08 03:40:58 UTC (rev 3626) +++ csw/mgar/pkg/java/ajcconfig/trunk/files/CSWajcconfigdoc.gspec 2009-03-08 09:21:24 UTC (rev 3627) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/${GARNAME}/License-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 8 12:01:02 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 08 Mar 2009 11:01:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[3628] csw/mgar/pkg/libnids/trunk Message-ID: Revision: 3628 http://gar.svn.sourceforge.net/gar/?rev=3628&view=rev Author: hson Date: 2009-03-08 11:01:02 +0000 (Sun, 08 Mar 2009) Log Message: ----------- libnids: Fix for gccism Modified Paths: -------------- csw/mgar/pkg/libnids/trunk/checksums csw/mgar/pkg/libnids/trunk/files/mainpatch Modified: csw/mgar/pkg/libnids/trunk/checksums =================================================================== --- csw/mgar/pkg/libnids/trunk/checksums 2009-03-08 09:21:24 UTC (rev 3627) +++ csw/mgar/pkg/libnids/trunk/checksums 2009-03-08 11:01:02 UTC (rev 3628) @@ -1,2 +1,2 @@ af35e8ef403a0ca95df2da94db856428 download/libnids-1.23.tar.gz -6caaa001bda6528aa6bb464de550b023 download/mainpatch +ea5ddd010782ed77209e2414e5500ec7 download/mainpatch Modified: csw/mgar/pkg/libnids/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-08 09:21:24 UTC (rev 3627) +++ csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-08 11:01:02 UTC (rev 3628) @@ -1,6 +1,6 @@ diff --speed-large-files --minimal -ru libnids-1.23.orig/src/Makefile.in libnids-1.23/src/Makefile.in --- libnids-1.23.orig/src/Makefile.in 2008-02-21 11:40:19.000000000 +0100 -+++ libnids-1.23/src/Makefile.in 2009-03-08 02:30:29.000000000 +0100 ++++ libnids-1.23/src/Makefile.in 2009-03-08 05:26:17.000000000 +0100 @@ -16,7 +16,7 @@ LIBSHARED = libnids.so.1.23 @@ -73,9 +73,21 @@ clean: rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/checksum.c libnids-1.23/src/checksum.c +--- libnids-1.23.orig/src/checksum.c 2005-02-08 16:46:11.000000000 +0100 ++++ libnids-1.23/src/checksum.c 2009-03-08 11:39:55.103753000 +0100 +@@ -25,7 +25,7 @@ + return 0; + } + +-#if ( __i386__ || __i386 ) ++#if ( __i386__ || __i386 ) && __GNUC__ + // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels + + /* diff --speed-large-files --minimal -ru libnids-1.23.orig/src/ip_options.c libnids-1.23/src/ip_options.c --- libnids-1.23.orig/src/ip_options.c 2002-08-10 21:07:45.000000000 +0200 -+++ libnids-1.23/src/ip_options.c 2009-03-08 02:18:44.000000000 +0100 ++++ libnids-1.23/src/ip_options.c 2009-03-08 05:26:17.000000000 +0100 @@ -69,7 +69,7 @@ unsigned char __pad1; unsigned char __pad2; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 13:09:28 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 12:09:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[3629] csw/mgar/pkg/java/ajcconfig/trunk/Makefile Message-ID: Revision: 3629 http://gar.svn.sourceforge.net/gar/?rev=3629&view=rev Author: wbonnet Date: 2009-03-08 12:09:28 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Fix typo Modified Paths: -------------- csw/mgar/pkg/java/ajcconfig/trunk/Makefile Modified: csw/mgar/pkg/java/ajcconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/Makefile 2009-03-08 11:01:02 UTC (rev 3628) +++ csw/mgar/pkg/java/ajcconfig/trunk/Makefile 2009-03-08 12:09:28 UTC (rev 3629) @@ -34,8 +34,8 @@ # Defines custom steps since java libs do not use autotools WORKSRC = $(WORKDIR) -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 15:18:12 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 14:18:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[3630] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 3630 http://gar.svn.sourceforge.net/gar/?rev=3630&view=rev Author: wbonnet Date: 2009-03-08 14:18:12 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Fix : If a pkg is not installed and declared in the REQUIRED lists, nothing was output to generaetd depend file, and target bilding was not stopped. This could create missing dependencies. This patch add the given package in the depend name without its description. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-03-08 12:09:28 UTC (rev 3629) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-03-08 14:18:12 UTC (rev 3630) @@ -282,7 +282,7 @@ $(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ - echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = "P"; print } ')"; \ + echo "$(shell /usr/bin/pkginfo $(PKG) || echo "P $(PKG) - " | awk '{ $$1 = "P"; print } ')"; \ ) \ )) >$@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 15:28:30 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 14:28:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[3631] csw/mgar/pkg/java/ajcconfig/trunk/Makefile Message-ID: Revision: 3631 http://gar.svn.sourceforge.net/gar/?rev=3631&view=rev Author: wbonnet Date: 2009-03-08 14:28:30 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Remove duplicated depend Modified Paths: -------------- csw/mgar/pkg/java/ajcconfig/trunk/Makefile Modified: csw/mgar/pkg/java/ajcconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcconfig/trunk/Makefile 2009-03-08 14:18:12 UTC (rev 3630) +++ csw/mgar/pkg/java/ajcconfig/trunk/Makefile 2009-03-08 14:28:30 UTC (rev 3631) @@ -25,7 +25,7 @@ SPKG_DESC_CSWajcconfigdoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajcconfig = CSWajclang CSWajclogging CSWajclang CSWajcdigester CSWajccollect CSWajcbeanutils +REQUIRED_PKGS_CSWajcconfig = CSWajclogging CSWajclang CSWajcdigester CSWajccollect CSWajcbeanutils # Defines package content PKGFILES_CSWajcconfig = $(prefix)/share/doc/$(GARNAME)/License.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 8 15:59:30 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 08 Mar 2009 14:59:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[3632] csw/mgar/pkg/distcc/trunk Message-ID: Revision: 3632 http://gar.svn.sourceforge.net/gar/?rev=3632&view=rev Author: hson Date: 2009-03-08 14:59:27 +0000 (Sun, 08 Mar 2009) Log Message: ----------- distcc: Update to 3.1 and gar v2 Modified Paths: -------------- csw/mgar/pkg/distcc/trunk/Makefile csw/mgar/pkg/distcc/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/distcc/trunk/ Property changes on: csw/mgar/pkg/distcc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/distcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/distcc/trunk/Makefile 2009-03-08 14:28:30 UTC (rev 3631) +++ csw/mgar/pkg/distcc/trunk/Makefile 2009-03-08 14:59:27 UTC (rev 3632) @@ -1,5 +1,5 @@ GARNAME = distcc -GARVERSION = 2.18.3 +GARVERSION = 3.1 CATEGORIES = devel DESCRIPTION = A fast, free distributed C/C++ compiler @@ -15,15 +15,16 @@ systems, if cross-compilers are installed. endef -MASTER_SITES = http://distcc.samba.org/ftp/distcc/ +MASTER_SITES = http://distcc.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWdistcc,depend) +SPKG_SOURCEURL = http://distcc.googlecode.com/ + +REQUIRED_PKGS += CSWlibpopt + # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/distcc/trunk/checksums =================================================================== --- csw/mgar/pkg/distcc/trunk/checksums 2009-03-08 14:28:30 UTC (rev 3631) +++ csw/mgar/pkg/distcc/trunk/checksums 2009-03-08 14:59:27 UTC (rev 3632) @@ -1,3 +1 @@ -0d6b80a1efc3a3d816c4f4175f63eaa2 download/distcc-2.18.3.tar.bz2 -d301ec445ac117b16707593e77713d82 download/CSWdistcc.gspec -132422465ab1757e87fb3f6d2087b6d9 download/CSWdistcc.depend +a1a9d3853df7133669fffec2a9aab9f3 download/distcc-3.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 16:37:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 15:37:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3633] csw/mgar/pkg/java Message-ID: Revision: 3633 http://gar.svn.sourceforge.net/gar/?rev=3633&view=rev Author: wbonnet Date: 2009-03-08 15:37:38 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcdigester/ csw/mgar/pkg/java/ajcdigester/Makefile csw/mgar/pkg/java/ajcdigester/branches/ csw/mgar/pkg/java/ajcdigester/tags/ csw/mgar/pkg/java/ajcdigester/trunk/ csw/mgar/pkg/java/ajcdigester/trunk/Makefile csw/mgar/pkg/java/ajcdigester/trunk/checksums csw/mgar/pkg/java/ajcdigester/trunk/files/ csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec Added: csw/mgar/pkg/java/ajcdigester/Makefile =================================================================== --- csw/mgar/pkg/java/ajcdigester/Makefile (rev 0) +++ csw/mgar/pkg/java/ajcdigester/Makefile 2009-03-08 15:37:38 UTC (rev 3633) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/java/ajcdigester/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/java/ajcdigester/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/Makefile (rev 0) +++ csw/mgar/pkg/java/ajcdigester/trunk/Makefile 2009-03-08 15:37:38 UTC (rev 3633) @@ -0,0 +1,54 @@ +SHORTNAME = digester +GARVERSION = 2.0 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons Digester +define BLURB +Apache Jakarta Commons Digester : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcdigester,) +DISTFILES += $(call admfiles,CSWajcdigesterdoc,) + +# Defines package description +SPKG_DESC_CSWajcdigester = $(DESCRIPTION) +SPKG_DESC_CSWajcdigesterdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcdigester = CSWajclogging CSWajccollect CSWajcbeanutils + +# Defines package content +PKGFILES_CSWajcdigester = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcdigester += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/java/ajcdigester/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/checksums (rev 0) +++ csw/mgar/pkg/java/ajcdigester/trunk/checksums 2009-03-08 15:37:38 UTC (rev 3633) @@ -0,0 +1,3 @@ +1f90462c586b6afb85e2c637d8f1c02e download/commons-digester-2.0-bin.tar.gz +0c896bc20ed87b2657653ae44cf18282 download/CSWajcdigester.gspec +94d73aedff4917be7fd53e060d17e01c download/CSWajcdigesterdoc.gspec Added: csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec (rev 0) +++ csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec 2009-03-08 15:37:38 UTC (rev 3633) @@ -0,0 +1,7 @@ +%var bitname commons_digester +%var pkgname CSWajcdigester +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/${GARNAME}/License.txt for license information Added: csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec (rev 0) +++ csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec 2009-03-08 15:37:38 UTC (rev 3633) @@ -0,0 +1,7 @@ +%var bitname commons_digester_doc +%var pkgname CSWajcdigesterdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/${GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Mar 8 17:32:37 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 08 Mar 2009 16:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3634] csw/mgar/pkg Message-ID: Revision: 3634 http://gar.svn.sourceforge.net/gar/?rev=3634&view=rev Author: skayser Date: 2009-03-08 16:32:37 +0000 (Sun, 08 Mar 2009) Log Message: ----------- mcabber: Initial commit Added Paths: ----------- csw/mgar/pkg/mcabber/ csw/mgar/pkg/mcabber/branches/ csw/mgar/pkg/mcabber/tags/ csw/mgar/pkg/mcabber/trunk/ csw/mgar/pkg/mcabber/trunk/Makefile csw/mgar/pkg/mcabber/trunk/checksums csw/mgar/pkg/mcabber/trunk/files/ csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff Property changes on: csw/mgar/pkg/mcabber/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,55 @@ +GARNAME = mcabber +GARVERSION = 0.9.9 +CATEGORIES = utils + +DESCRIPTION = A small Jabber console client +define BLURB +mcabber is a small Jabber console client. mcabber includes features such as +SSL support, MUC (Multi-User Chat) support, history logging, command +completion, OpenPGP encryption, OTR (Off-the-Record Messaging) support and +external action triggers. +endef + +MASTER_SITES = http://www.lilotux.net/~mikael/mcabber/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +SPKG_SOURCEURL = http://www.lilotux.net/~mikael/mcabber/ + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWncurses CSWosslrt CSWotr +REQUIRED_PKGS = CSWaspell CSWggettextrt CSWglib2 +REQUIRED_PKGS = CSWgpgerr CSWgpgme CSWiconv + +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-openssl=/opt/csw/lib +CONFIGURE_ARGS += --enable-otr +CONFIGURE_ARGS += --enable-aspell + +# mcabber is geared towards gcc and heavily uses inline functions without +# static/extern storage qualifiers. Sun Studio needs to emulate gcc +# behaviour with regards to these inline functions. +# +# For details see http://blogs.sun.com/dew/entry/c99_inline_function +# +EXTRA_CFLAGS = -features=no%extinl + +EXTRA_LDFLAGS = -lsocket +EXTRA_INC = /opt/csw/lib/ncurses + +# Get rid of inline functions which are referenced externally (no%extinl +# makes inline functions static and would break linking otherwise) +PATCHFILES = patch-inline.diff + +# Solaris 8 doesn't have iswlbank(), provide replacement macro +PATCHFILES = patch-iswblank.diff + +include gar/category.mk + +pre-build-modulated: + @perl -pi -e 's|#! /bin/sh|#!/bin/bash|' $(WORKSRC)/hgcset.sh + @perl -pi -e 's|-O2||' \ + $(WORKSRC)/Makefile \ + $(WORKSRC)/src/Makefile \ + $(WORKSRC)/libjabber/Makefile Added: csw/mgar/pkg/mcabber/trunk/checksums =================================================================== --- csw/mgar/pkg/mcabber/trunk/checksums (rev 0) +++ csw/mgar/pkg/mcabber/trunk/checksums 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,2 @@ +189fb9d23f5a8412bc660884528475ea download/mcabber-0.9.9.tar.bz2 +756f80c0584594d5e66d3bdeadc5ca56 download/patch-iswblank.diff Added: csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff (rev 0) +++ csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,128 @@ +--- mcabber-0.9.9/src/histolog.c 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/histolog.c 2009-03-08 16:35:25.758629698 +0100 +@@ -398,7 +398,7 @@ + return UseFileLogging; + } + +-inline void hlog_write_message(const char *bjid, time_t timestamp, int sent, ++void hlog_write_message(const char *bjid, time_t timestamp, int sent, + const char *msg) + { + guchar info; +@@ -415,7 +415,7 @@ + write_histo_line(bjid, timestamp, 'M', info, msg); + } + +-inline void hlog_write_status(const char *bjid, time_t timestamp, ++void hlog_write_status(const char *bjid, time_t timestamp, + enum imstatus status, const char *status_msg) + { + // XXX Check status value? +diff -ur mcabber-0.9.9/src/jabglue.c work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c +--- mcabber-0.9.9/src/jabglue.c 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c 2009-03-08 15:49:11.552806445 +0100 +@@ -171,7 +171,7 @@ + jc = NULL; + } + +-inline void jb_reset_keepalive() ++void jb_reset_keepalive() + { + time(&LastPingTime); + } +@@ -344,12 +344,12 @@ + } + } + +-inline enum imstatus jb_getstatus() ++enum imstatus jb_getstatus() + { + return mystatus; + } + +-inline const char *jb_getstatusmsg() ++const char *jb_getstatusmsg() + { + return mystatusmsg; + } +@@ -554,7 +554,7 @@ + + // jb_setprevstatus() + // Set previous status. This wrapper function is used after a disconnection. +-inline void jb_setprevstatus(void) ++void jb_setprevstatus(void) + { + jb_setstatus(mywantedstatus, NULL, mystatusmsg, FALSE); + } +diff -ur mcabber-0.9.9/src/screen.c work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c +--- mcabber-0.9.9/src/screen.c 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c 2009-03-08 16:45:11.929482636 +0100 +@@ -155,8 +156,8 @@ + unsigned int prefix_flags, int force_show, + unsigned mucnicklen); + +-inline void scr_UpdateBuddyWindow(void); +-inline void scr_set_chatmode(int enable); ++void scr_UpdateBuddyWindow(void); ++void scr_set_chatmode(int enable); + + #ifdef HAVE_ASPELL_H + #define ASPELLBADCHAR 5 +@@ -1257,7 +1258,7 @@ + // (Re)Display the current window. + // If chatmode is enabled, call scr_ShowBuddyWindow(), + // else display the chat window. +-inline void scr_UpdateBuddyWindow(void) ++void scr_UpdateBuddyWindow(void) + { + if (chatmode) { + scr_ShowBuddyWindow(); +@@ -2153,7 +2154,7 @@ + } + + #if defined JEP0022 || defined JEP0085 +-inline long int scr_GetChatStatesTimeout(time_t now) ++long int scr_GetChatStatesTimeout(time_t now) + { + // Check if we're currently composing... + if (chatstate != 1 || !chatstate_timestamp) +@@ -2801,7 +2802,7 @@ + + // scr_set_chatmode() + // Public function to (un)set chatmode... +-inline void scr_set_chatmode(int enable) ++void scr_set_chatmode(int enable) + { + chatmode = enable; + scr_UpdateChatStatus(TRUE); +@@ -2809,14 +2810,14 @@ + + // scr_get_chatmode() + // Public function to get chatmode state. +-inline int scr_get_chatmode(void) ++int scr_get_chatmode(void) + { + return chatmode; + } + + // scr_get_multimode() + // Public function to get multimode status... +-inline int scr_get_multimode(void) ++int scr_get_multimode(void) + { + return multimode; + } +diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h +--- mcabber-0.9.9/src/screen.h 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 +@@ -20,6 +20,10 @@ + //static void spellcheck(char*, char*); + #endif + ++#ifndef HAVE_ISWBLANK ++#define iswblank(wc) iswctype(wc, wctype("blank")) ++#endif ++ + #include "hbuf.h" + #include "logprint.h" + Added: csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff (rev 0) +++ csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff 2009-03-08 16:32:37 UTC (rev 3634) @@ -0,0 +1,14 @@ +diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h +--- mcabber-0.9.9/src/screen.h 2008-10-09 22:17:52.000000000 +0200 ++++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 +@@ -20,6 +20,10 @@ + //static void spellcheck(char*, char*); + #endif + ++#ifndef HAVE_ISWBLANK ++#define iswblank(wc) iswctype(wc, wctype("blank")) ++#endif ++ + #include "hbuf.h" + #include "logprint.h" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:22:41 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:22:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[3635] csw/mgar/pkg Message-ID: Revision: 3635 http://gar.svn.sourceforge.net/gar/?rev=3635&view=rev Author: wbonnet Date: 2009-03-08 18:22:41 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcdiscovery/ csw/mgar/pkg/ajcdiscovery/branches/ csw/mgar/pkg/ajcdiscovery/tags/ csw/mgar/pkg/ajcdiscovery/trunk/ csw/mgar/pkg/ajcdiscovery/trunk/Makefile csw/mgar/pkg/ajcdiscovery/trunk/files/ Property changes on: csw/mgar/pkg/ajcdiscovery/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcdiscovery/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcdiscovery/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcdiscovery/trunk/Makefile 2009-03-08 18:22:41 UTC (rev 3635) @@ -0,0 +1,54 @@ +SHORTNAME = discovery +GARVERSION = 0.4 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons Discovery +define BLURB +Apache Jakarta Commons Discovery : Component about discovering for pluggable interfaces +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcdiscovery,) +DISTFILES += $(call admfiles,CSWajcdiscoverydoc,) + +# Defines package description +SPKG_DESC_CSWajcdiscovery = $(DESCRIPTION) +SPKG_DESC_CSWajcdiscoverydoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcdiscovery = CSWajclogging + +# Defines package content +PKGFILES_CSWajcdiscovery = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcdiscovery += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-0.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:24:40 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:24:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[3636] csw/mgar/pkg/ajcdiscovery/trunk Message-ID: Revision: 3636 http://gar.svn.sourceforge.net/gar/?rev=3636&view=rev Author: wbonnet Date: 2009-03-08 18:24:40 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcdiscovery/trunk/checksums csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscovery.gspec csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscoverydoc.gspec Added: csw/mgar/pkg/ajcdiscovery/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcdiscovery/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcdiscovery/trunk/checksums 2009-03-08 18:24:40 UTC (rev 3636) @@ -0,0 +1,3 @@ +e612b7c2398eff2472dbd9f8739aca70 download/commons-discovery-0.4.tar.gz +40e5b688b9130018134bc19501379649 download/CSWajcdiscovery.gspec +e7ddad805bbe3a27bf80e29e5b29febd download/CSWajcdiscoverydoc.gspec Added: csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscovery.gspec =================================================================== --- csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscovery.gspec (rev 0) +++ csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscovery.gspec 2009-03-08 18:24:40 UTC (rev 3636) @@ -0,0 +1,7 @@ +%var bitname commons_discovery +%var pkgname CSWajcdiscovery +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscoverydoc.gspec =================================================================== --- csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscoverydoc.gspec (rev 0) +++ csw/mgar/pkg/ajcdiscovery/trunk/files/CSWajcdiscoverydoc.gspec 2009-03-08 18:24:40 UTC (rev 3636) @@ -0,0 +1,7 @@ +%var bitname commons_disco_doc +%var pkgname CSWajcdiscoverydoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:25:22 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:25:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[3637] csw/mgar/pkg/ajcdiscovery/Makefile Message-ID: Revision: 3637 http://gar.svn.sourceforge.net/gar/?rev=3637&view=rev Author: wbonnet Date: 2009-03-08 18:25:22 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcdiscovery/Makefile Added: csw/mgar/pkg/ajcdiscovery/Makefile =================================================================== --- csw/mgar/pkg/ajcdiscovery/Makefile (rev 0) +++ csw/mgar/pkg/ajcdiscovery/Makefile 2009-03-08 18:25:22 UTC (rev 3637) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:28:25 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:28:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3638] csw/mgar/pkg/java Message-ID: Revision: 3638 http://gar.svn.sourceforge.net/gar/?rev=3638&view=rev Author: wbonnet Date: 2009-03-08 18:28:25 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcdiscovery/ csw/mgar/pkg/java/ajcdiscovery/Makefile csw/mgar/pkg/java/ajcdiscovery/branches/ csw/mgar/pkg/java/ajcdiscovery/tags/ csw/mgar/pkg/java/ajcdiscovery/trunk/ Removed Paths: ------------- csw/mgar/pkg/java/ajcdiscovery/branches/ csw/mgar/pkg/java/ajcdiscovery/tags/ csw/mgar/pkg/java/ajcdiscovery/trunk/ Copied: csw/mgar/pkg/java/ajcdiscovery/Makefile (from rev 3637, csw/mgar/pkg/ajcdiscovery/Makefile) =================================================================== --- csw/mgar/pkg/java/ajcdiscovery/Makefile (rev 0) +++ csw/mgar/pkg/java/ajcdiscovery/Makefile 2009-03-08 18:28:25 UTC (rev 3638) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:29:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:29:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3639] csw/mgar/pkg/ajcdiscovery/ Message-ID: Revision: 3639 http://gar.svn.sourceforge.net/gar/?rev=3639&view=rev Author: wbonnet Date: 2009-03-08 18:29:32 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Removed Paths: ------------- csw/mgar/pkg/ajcdiscovery/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:37:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:37:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3640] csw/mgar/pkg Message-ID: Revision: 3640 http://gar.svn.sourceforge.net/gar/?rev=3640&view=rev Author: wbonnet Date: 2009-03-08 18:37:45 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcemail/ csw/mgar/pkg/ajcemail/Makefile csw/mgar/pkg/ajcemail/branches/ csw/mgar/pkg/ajcemail/tags/ csw/mgar/pkg/ajcemail/trunk/ csw/mgar/pkg/ajcemail/trunk/Makefile csw/mgar/pkg/ajcemail/trunk/checksums csw/mgar/pkg/ajcemail/trunk/files/ csw/mgar/pkg/ajcemail/trunk/files/CSWajcemail.gspec csw/mgar/pkg/ajcemail/trunk/files/CSWajcemaildoc.gspec Added: csw/mgar/pkg/ajcemail/Makefile =================================================================== --- csw/mgar/pkg/ajcemail/Makefile (rev 0) +++ csw/mgar/pkg/ajcemail/Makefile 2009-03-08 18:37:45 UTC (rev 3640) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcemail/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcemail/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcemail/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcemail/trunk/Makefile 2009-03-08 18:37:45 UTC (rev 3640) @@ -0,0 +1,54 @@ +SHORTNAME = email +GARVERSION = 1.1 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons Email +define BLURB +Apache Jakarta Commons Email : provide a API for sending email +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcemail,) +DISTFILES += $(call admfiles,CSWajcemaildoc,) + +# Defines package description +SPKG_DESC_CSWajcemail = $(DESCRIPTION) +SPKG_DESC_CSWajcemaildoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcemail = CSWajclogging CSWajccollect CSWajcbeanutils + +# Defines package content +PKGFILES_CSWajcemail = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcemail += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcemail/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcemail/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcemail/trunk/checksums 2009-03-08 18:37:45 UTC (rev 3640) @@ -0,0 +1,3 @@ +c82d89aab2e58d1c50e44db4c6a6a8f9 download/commons-email-1.1-bin.tar.gz +c6e394e0d325e28751330370274fe370 download/CSWajcemail.gspec +1e11b6a6e721335beea0c4a2f5ad5b47 download/CSWajcemaildoc.gspec Added: csw/mgar/pkg/ajcemail/trunk/files/CSWajcemail.gspec =================================================================== --- csw/mgar/pkg/ajcemail/trunk/files/CSWajcemail.gspec (rev 0) +++ csw/mgar/pkg/ajcemail/trunk/files/CSWajcemail.gspec 2009-03-08 18:37:45 UTC (rev 3640) @@ -0,0 +1,7 @@ +%var bitname commons_email +%var pkgname CSWajcemail +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcemail/trunk/files/CSWajcemaildoc.gspec =================================================================== --- csw/mgar/pkg/ajcemail/trunk/files/CSWajcemaildoc.gspec (rev 0) +++ csw/mgar/pkg/ajcemail/trunk/files/CSWajcemaildoc.gspec 2009-03-08 18:37:45 UTC (rev 3640) @@ -0,0 +1,7 @@ +%var bitname commons_email_doc +%var pkgname CSWajcemaildoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:38:31 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:38:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3641] csw/mgar/pkg Message-ID: Revision: 3641 http://gar.svn.sourceforge.net/gar/?rev=3641&view=rev Author: wbonnet Date: 2009-03-08 18:38:31 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcemail/ Removed Paths: ------------- csw/mgar/pkg/ajcemail/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:46:09 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:46:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3642] csw/mgar/pkg Message-ID: Revision: 3642 http://gar.svn.sourceforge.net/gar/?rev=3642&view=rev Author: wbonnet Date: 2009-03-08 18:46:08 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajchttpcl/ csw/mgar/pkg/ajchttpcl/Makefile csw/mgar/pkg/ajchttpcl/branches/ csw/mgar/pkg/ajchttpcl/tags/ csw/mgar/pkg/ajchttpcl/trunk/ csw/mgar/pkg/ajchttpcl/trunk/Makefile csw/mgar/pkg/ajchttpcl/trunk/files/ csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcldoc.gspec Added: csw/mgar/pkg/ajchttpcl/Makefile =================================================================== --- csw/mgar/pkg/ajchttpcl/Makefile (rev 0) +++ csw/mgar/pkg/ajchttpcl/Makefile 2009-03-08 18:46:08 UTC (rev 3642) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajchttpcl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajchttpcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajchttpcl/trunk/Makefile 2009-03-08 18:46:08 UTC (rev 3642) @@ -0,0 +1,54 @@ +SHORTNAME = httpclient +GARVERSION = 3.1 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons HttpClient +define BLURB +Apache Jakarta Commons HttpClient : framework for working with the client-side of the HTTP protocol +endef + +# Use jakarta sources +MASTER_SITES = http://www.apache.org/dist/httpcomponents/commons-$(SHORTNAME)/binary/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajchttpclient,) +DISTFILES += $(call admfiles,CSWajchttpcldoc,) + +# Defines package description +SPKG_DESC_CSWajchttpclient = $(DESCRIPTION) +SPKG_DESC_CSWajchttpcldoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajchttpclient = CSWajclogging + +# Defines package content +PKGFILES_CSWajchttpclient = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajchttpclient += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec (rev 0) +++ csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec 2009-03-08 18:46:08 UTC (rev 3642) @@ -0,0 +1,7 @@ +%var bitname commons_httpclient +%var pkgname CSWajchttpclient +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcldoc.gspec =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcldoc.gspec (rev 0) +++ csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcldoc.gspec 2009-03-08 18:46:08 UTC (rev 3642) @@ -0,0 +1,7 @@ +%var bitname commons_httpcl_doc +%var pkgname CSWajchttpcldoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:52:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:52:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[3643] csw/mgar/pkg/ajchttpcl/trunk Message-ID: Revision: 3643 http://gar.svn.sourceforge.net/gar/?rev=3643&view=rev Author: wbonnet Date: 2009-03-08 18:52:54 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Modified Paths: -------------- csw/mgar/pkg/ajchttpcl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ajchttpcl/trunk/checksums csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpclient.gspec Removed Paths: ------------- csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec Modified: csw/mgar/pkg/ajchttpcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/Makefile 2009-03-08 18:46:08 UTC (rev 3642) +++ csw/mgar/pkg/ajchttpcl/trunk/Makefile 2009-03-08 18:52:54 UTC (rev 3643) @@ -45,10 +45,10 @@ @ginstall -d $(DESTDIR)$(datadir)/java @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java @( cd $(DESTDIR)$(datadir)/java ; \ - ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-3.jar ; \ ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt - @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) @$(MAKECOOKIE) Added: csw/mgar/pkg/ajchttpcl/trunk/checksums =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajchttpcl/trunk/checksums 2009-03-08 18:52:54 UTC (rev 3643) @@ -0,0 +1,3 @@ +7af3abac4812600ce33cbecb1373f24e download/commons-httpclient-3.1.tar.gz +fbc545e4ea8139d291d6598acbb00c9a download/CSWajchttpclient.gspec +a903b381a42b190992073c066e30c946 download/CSWajchttpcldoc.gspec Deleted: csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec 2009-03-08 18:46:08 UTC (rev 3642) +++ csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec 2009-03-08 18:52:54 UTC (rev 3643) @@ -1,7 +0,0 @@ -%var bitname commons_httpclient -%var pkgname CSWajchttpclient -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Copied: csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpclient.gspec (from rev 3642, csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec) =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpclient.gspec (rev 0) +++ csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpclient.gspec 2009-03-08 18:52:54 UTC (rev 3643) @@ -0,0 +1,7 @@ +%var bitname commons_httpclient +%var pkgname CSWajchttpclient +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 19:55:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 18:55:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[3644] csw/mgar/pkg Message-ID: Revision: 3644 http://gar.svn.sourceforge.net/gar/?rev=3644&view=rev Author: wbonnet Date: 2009-03-08 18:55:13 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajchttpcl/ csw/mgar/pkg/java/ajchttpcl/trunk/Makefile csw/mgar/pkg/java/ajchttpcl/trunk/checksums csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpclient.gspec Removed Paths: ------------- csw/mgar/pkg/ajchttpcl/ csw/mgar/pkg/java/ajchttpcl/trunk/Makefile csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpcl.gspec Deleted: csw/mgar/pkg/java/ajchttpcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/Makefile 2009-03-08 18:46:08 UTC (rev 3642) +++ csw/mgar/pkg/java/ajchttpcl/trunk/Makefile 2009-03-08 18:55:13 UTC (rev 3644) @@ -1,54 +0,0 @@ -SHORTNAME = httpclient -GARVERSION = 3.1 - -GARNAME = commons-$(SHORTNAME) -CATEGORIES = java - -DESCRIPTION = Apache Jakarta Commons HttpClient -define BLURB -Apache Jakarta Commons HttpClient : framework for working with the client-side of the HTTP protocol -endef - -# Use jakarta sources -MASTER_SITES = http://www.apache.org/dist/httpcomponents/commons-$(SHORTNAME)/binary/ -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz - -# Set archive filename -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# Defines two packages, lib and doc -DISTFILES += $(call admfiles,CSWajchttpclient,) -DISTFILES += $(call admfiles,CSWajchttpcldoc,) - -# Defines package description -SPKG_DESC_CSWajchttpclient = $(DESCRIPTION) -SPKG_DESC_CSWajchttpcldoc = $(DESCRIPTION) documentation package - -# Defines dependencies -REQUIRED_PKGS_CSWajchttpclient = CSWajclogging - -# Defines package content -PKGFILES_CSWajchttpclient = $(prefix)/share/doc/$(GARNAME)/License.txt -PKGFILES_CSWajchttpclient += $(prefix)/share/java/.* - -# Defines custom steps since java libs do not use autotools -WORKSRC = $(WORKDIR) - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = -INSTALL_SCRIPTS = custom - -include gar/category.mk - -install-custom: - @ginstall -d $(DESTDIR)$(datadir)/java - @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java - @( cd $(DESTDIR)$(datadir)/java ; \ - ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-2.jar ; \ - ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) - @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt - @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt - @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/java/ajchttpcl/trunk/Makefile (from rev 3643, csw/mgar/pkg/ajchttpcl/trunk/Makefile) =================================================================== --- csw/mgar/pkg/java/ajchttpcl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/java/ajchttpcl/trunk/Makefile 2009-03-08 18:55:13 UTC (rev 3644) @@ -0,0 +1,54 @@ +SHORTNAME = httpclient +GARVERSION = 3.1 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons HttpClient +define BLURB +Apache Jakarta Commons HttpClient : framework for working with the client-side of the HTTP protocol +endef + +# Use jakarta sources +MASTER_SITES = http://www.apache.org/dist/httpcomponents/commons-$(SHORTNAME)/binary/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajchttpclient,) +DISTFILES += $(call admfiles,CSWajchttpcldoc,) + +# Defines package description +SPKG_DESC_CSWajchttpclient = $(DESCRIPTION) +SPKG_DESC_CSWajchttpcldoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajchttpclient = CSWajclogging + +# Defines package content +PKGFILES_CSWajchttpclient = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajchttpclient += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-3.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Copied: csw/mgar/pkg/java/ajchttpcl/trunk/checksums (from rev 3643, csw/mgar/pkg/ajchttpcl/trunk/checksums) =================================================================== --- csw/mgar/pkg/java/ajchttpcl/trunk/checksums (rev 0) +++ csw/mgar/pkg/java/ajchttpcl/trunk/checksums 2009-03-08 18:55:13 UTC (rev 3644) @@ -0,0 +1,3 @@ +7af3abac4812600ce33cbecb1373f24e download/commons-httpclient-3.1.tar.gz +fbc545e4ea8139d291d6598acbb00c9a download/CSWajchttpclient.gspec +a903b381a42b190992073c066e30c946 download/CSWajchttpcldoc.gspec Deleted: csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpcl.gspec =================================================================== --- csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpcl.gspec 2009-03-08 18:46:08 UTC (rev 3642) +++ csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpcl.gspec 2009-03-08 18:55:13 UTC (rev 3644) @@ -1,7 +0,0 @@ -%var bitname commons_httpclient -%var pkgname CSWajchttpclient -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Copied: csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpclient.gspec (from rev 3643, csw/mgar/pkg/ajchttpcl/trunk/files/CSWajchttpclient.gspec) =================================================================== --- csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpclient.gspec (rev 0) +++ csw/mgar/pkg/java/ajchttpcl/trunk/files/CSWajchttpclient.gspec 2009-03-08 18:55:13 UTC (rev 3644) @@ -0,0 +1,7 @@ +%var bitname commons_httpclient +%var pkgname CSWajchttpclient +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:00:35 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:00:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[3645] csw/mgar/pkg Message-ID: Revision: 3645 http://gar.svn.sourceforge.net/gar/?rev=3645&view=rev Author: wbonnet Date: 2009-03-08 19:00:35 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcio/ csw/mgar/pkg/ajcio/Makefile csw/mgar/pkg/ajcio/branches/ csw/mgar/pkg/ajcio/tags/ csw/mgar/pkg/ajcio/trunk/ csw/mgar/pkg/ajcio/trunk/Makefile csw/mgar/pkg/ajcio/trunk/checksums csw/mgar/pkg/ajcio/trunk/files/ csw/mgar/pkg/ajcio/trunk/files/CSWajcio.gspec csw/mgar/pkg/ajcio/trunk/files/CSWajciodoc.gspec Added: csw/mgar/pkg/ajcio/Makefile =================================================================== --- csw/mgar/pkg/ajcio/Makefile (rev 0) +++ csw/mgar/pkg/ajcio/Makefile 2009-03-08 19:00:35 UTC (rev 3645) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcio/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcio/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcio/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcio/trunk/Makefile 2009-03-08 19:00:35 UTC (rev 3645) @@ -0,0 +1,54 @@ +SHORTNAME = io +GARVERSION = 1.4 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons io +define BLURB +Apache Jakarta Commons io : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcio,) +DISTFILES += $(call admfiles,CSWajciodoc,) + +# Defines package description +SPKG_DESC_CSWajcio = $(DESCRIPTION) +SPKG_DESC_CSWajciodoc = $(DESCRIPTION) documentation package + +# Defines dependencies +# REQUIRED_PKGS_CSWajcio = No dependency + +# Defines package content +PKGFILES_CSWajcio = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcio += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcio/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcio/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcio/trunk/checksums 2009-03-08 19:00:35 UTC (rev 3645) @@ -0,0 +1,3 @@ +2cef2d863797d4f06ea447199da56648 download/commons-io-1.4-bin.tar.gz +5d5b95a8cde69870e2f598c69eb3ec0a download/CSWajcio.gspec +2448b5c0a4ba74bd43ab5875ca47572a download/CSWajciodoc.gspec Added: csw/mgar/pkg/ajcio/trunk/files/CSWajcio.gspec =================================================================== --- csw/mgar/pkg/ajcio/trunk/files/CSWajcio.gspec (rev 0) +++ csw/mgar/pkg/ajcio/trunk/files/CSWajcio.gspec 2009-03-08 19:00:35 UTC (rev 3645) @@ -0,0 +1,7 @@ +%var bitname commons_io +%var pkgname CSWajcio +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcio/trunk/files/CSWajciodoc.gspec =================================================================== --- csw/mgar/pkg/ajcio/trunk/files/CSWajciodoc.gspec (rev 0) +++ csw/mgar/pkg/ajcio/trunk/files/CSWajciodoc.gspec 2009-03-08 19:00:35 UTC (rev 3645) @@ -0,0 +1,7 @@ +%var bitname commons_io_doc +%var pkgname CSWajciodoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:01:42 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3646] csw/mgar/pkg Message-ID: Revision: 3646 http://gar.svn.sourceforge.net/gar/?rev=3646&view=rev Author: wbonnet Date: 2009-03-08 19:01:42 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcio/ Removed Paths: ------------- csw/mgar/pkg/ajcio/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:07:29 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[3647] csw/mgar/pkg Message-ID: Revision: 3647 http://gar.svn.sourceforge.net/gar/?rev=3647&view=rev Author: wbonnet Date: 2009-03-08 19:07:29 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajclang/ csw/mgar/pkg/ajclang/Makefile csw/mgar/pkg/ajclang/branches/ csw/mgar/pkg/ajclang/tags/ csw/mgar/pkg/ajclang/trunk/ csw/mgar/pkg/ajclang/trunk/Makefile csw/mgar/pkg/ajclang/trunk/checksums csw/mgar/pkg/ajclang/trunk/files/ csw/mgar/pkg/ajclang/trunk/files/CSWajclang.gspec csw/mgar/pkg/ajclang/trunk/files/CSWajclangdoc.gspec Added: csw/mgar/pkg/ajclang/Makefile =================================================================== --- csw/mgar/pkg/ajclang/Makefile (rev 0) +++ csw/mgar/pkg/ajclang/Makefile 2009-03-08 19:07:29 UTC (rev 3647) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajclang/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajclang/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajclang/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajclang/trunk/Makefile 2009-03-08 19:07:29 UTC (rev 3647) @@ -0,0 +1,54 @@ +SHORTNAME = lang +GARVERSION = 2.4 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons lang +define BLURB +Apache Jakarta Commons lang : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajclang,) +DISTFILES += $(call admfiles,CSWajclangdoc,) + +# Defines package description +SPKG_DESC_CSWajclang = $(DESCRIPTION) +SPKG_DESC_CSWajclangdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajclang = CSWajcconfig + +# Defines package content +PKGFILES_CSWajclang = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajclang += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajclang/trunk/checksums =================================================================== --- csw/mgar/pkg/ajclang/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajclang/trunk/checksums 2009-03-08 19:07:29 UTC (rev 3647) @@ -0,0 +1,3 @@ +5ff5d890e46021a2dbd77caba80f90f2 download/commons-lang-2.4-bin.tar.gz +4cbc407e39410177a18ae06e9c421923 download/CSWajclang.gspec +c5b33b5a694a837ebf14f7d33deadc84 download/CSWajclangdoc.gspec Added: csw/mgar/pkg/ajclang/trunk/files/CSWajclang.gspec =================================================================== --- csw/mgar/pkg/ajclang/trunk/files/CSWajclang.gspec (rev 0) +++ csw/mgar/pkg/ajclang/trunk/files/CSWajclang.gspec 2009-03-08 19:07:29 UTC (rev 3647) @@ -0,0 +1,7 @@ +%var bitname commons_lang +%var pkgname CSWajclang +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajclang/trunk/files/CSWajclangdoc.gspec =================================================================== --- csw/mgar/pkg/ajclang/trunk/files/CSWajclangdoc.gspec (rev 0) +++ csw/mgar/pkg/ajclang/trunk/files/CSWajclangdoc.gspec 2009-03-08 19:07:29 UTC (rev 3647) @@ -0,0 +1,7 @@ +%var bitname commons_lang_doc +%var pkgname CSWajclangdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:08:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:08:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[3648] csw/mgar/pkg Message-ID: Revision: 3648 http://gar.svn.sourceforge.net/gar/?rev=3648&view=rev Author: wbonnet Date: 2009-03-08 19:08:43 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajclang/ Removed Paths: ------------- csw/mgar/pkg/ajclang/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:18:10 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:18:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[3649] csw/mgar/pkg Message-ID: Revision: 3649 http://gar.svn.sourceforge.net/gar/?rev=3649&view=rev Author: wbonnet Date: 2009-03-08 19:18:09 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajclogging/ csw/mgar/pkg/ajclogging/Makefile csw/mgar/pkg/ajclogging/branches/ csw/mgar/pkg/ajclogging/tags/ csw/mgar/pkg/ajclogging/trunk/ csw/mgar/pkg/ajclogging/trunk/Makefile csw/mgar/pkg/ajclogging/trunk/checksums csw/mgar/pkg/ajclogging/trunk/files/ csw/mgar/pkg/ajclogging/trunk/files/CSWajclogging.gspec csw/mgar/pkg/ajclogging/trunk/files/CSWajcloggingdoc.gspec Added: csw/mgar/pkg/ajclogging/Makefile =================================================================== --- csw/mgar/pkg/ajclogging/Makefile (rev 0) +++ csw/mgar/pkg/ajclogging/Makefile 2009-03-08 19:18:09 UTC (rev 3649) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajclogging/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajclogging/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajclogging/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajclogging/trunk/Makefile 2009-03-08 19:18:09 UTC (rev 3649) @@ -0,0 +1,55 @@ +SHORTNAME = logging +GARVERSION = 1.1.1 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons logging +define BLURB +Apache Jakarta Commons logging : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajclogging,) +DISTFILES += $(call admfiles,CSWajcloggingdoc,) + +# Defines package description +SPKG_DESC_CSWajclogging = $(DESCRIPTION) +SPKG_DESC_CSWajcloggingdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajclogging = CSWlog4j + +# Defines package content +PKGFILES_CSWajclogging = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajclogging += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/site/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajclogging/trunk/checksums =================================================================== --- csw/mgar/pkg/ajclogging/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajclogging/trunk/checksums 2009-03-08 19:18:09 UTC (rev 3649) @@ -0,0 +1,3 @@ +e5de09672af9b386c30a311654d8541a download/commons-logging-1.1.1-bin.tar.gz +93fc47a5cc54689eb4da69e1097e47db download/CSWajclogging.gspec +fd1007e63d2adbac4eadaa0ee1cddf0d download/CSWajcloggingdoc.gspec Added: csw/mgar/pkg/ajclogging/trunk/files/CSWajclogging.gspec =================================================================== --- csw/mgar/pkg/ajclogging/trunk/files/CSWajclogging.gspec (rev 0) +++ csw/mgar/pkg/ajclogging/trunk/files/CSWajclogging.gspec 2009-03-08 19:18:09 UTC (rev 3649) @@ -0,0 +1,7 @@ +%var bitname commons_logging +%var pkgname CSWajclogging +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajclogging/trunk/files/CSWajcloggingdoc.gspec =================================================================== --- csw/mgar/pkg/ajclogging/trunk/files/CSWajcloggingdoc.gspec (rev 0) +++ csw/mgar/pkg/ajclogging/trunk/files/CSWajcloggingdoc.gspec 2009-03-08 19:18:09 UTC (rev 3649) @@ -0,0 +1,7 @@ +%var bitname commons_logging_doc +%var pkgname CSWajcloggingdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:19:29 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:19:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[3650] csw/mgar/pkg Message-ID: Revision: 3650 http://gar.svn.sourceforge.net/gar/?rev=3650&view=rev Author: wbonnet Date: 2009-03-08 19:19:29 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajclogging/ Removed Paths: ------------- csw/mgar/pkg/ajclogging/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:28:02 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:28:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[3651] csw/mgar/pkg Message-ID: Revision: 3651 http://gar.svn.sourceforge.net/gar/?rev=3651&view=rev Author: wbonnet Date: 2009-03-08 19:28:02 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcmath/ csw/mgar/pkg/ajcmath/Makefile csw/mgar/pkg/ajcmath/branches/ csw/mgar/pkg/ajcmath/tags/ csw/mgar/pkg/ajcmath/trunk/ csw/mgar/pkg/ajcmath/trunk/Makefile csw/mgar/pkg/ajcmath/trunk/checksums csw/mgar/pkg/ajcmath/trunk/files/ csw/mgar/pkg/ajcmath/trunk/files/CSWajcmath.gspec csw/mgar/pkg/ajcmath/trunk/files/CSWajcmathdoc.gspec Added: csw/mgar/pkg/ajcmath/Makefile =================================================================== --- csw/mgar/pkg/ajcmath/Makefile (rev 0) +++ csw/mgar/pkg/ajcmath/Makefile 2009-03-08 19:28:02 UTC (rev 3651) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcmath/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcmath/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcmath/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcmath/trunk/Makefile 2009-03-08 19:28:02 UTC (rev 3651) @@ -0,0 +1,54 @@ +SHORTNAME = math +GARVERSION = 1.2 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons math +define BLURB +Apache Jakarta Commons math : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcmath,) +DISTFILES += $(call admfiles,CSWajcmathdoc,) + +# Defines package description +SPKG_DESC_CSWajcmath = $(DESCRIPTION) +SPKG_DESC_CSWajcmathdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcmath = CSWajcdiscovery + +# Defines package content +PKGFILES_CSWajcmath = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcmath += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcmath/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcmath/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcmath/trunk/checksums 2009-03-08 19:28:02 UTC (rev 3651) @@ -0,0 +1,3 @@ +6296081b9b9c0f3f7469565a96454a35 download/commons-math-1.2.tar.gz +7299a462f2b113ab49bf7820db254da5 download/CSWajcmath.gspec +399e3dab33c386cc7e5799855aea0738 download/CSWajcmathdoc.gspec Added: csw/mgar/pkg/ajcmath/trunk/files/CSWajcmath.gspec =================================================================== --- csw/mgar/pkg/ajcmath/trunk/files/CSWajcmath.gspec (rev 0) +++ csw/mgar/pkg/ajcmath/trunk/files/CSWajcmath.gspec 2009-03-08 19:28:02 UTC (rev 3651) @@ -0,0 +1,7 @@ +%var bitname commons_math +%var pkgname CSWajcmath +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcmath/trunk/files/CSWajcmathdoc.gspec =================================================================== --- csw/mgar/pkg/ajcmath/trunk/files/CSWajcmathdoc.gspec (rev 0) +++ csw/mgar/pkg/ajcmath/trunk/files/CSWajcmathdoc.gspec 2009-03-08 19:28:02 UTC (rev 3651) @@ -0,0 +1,7 @@ +%var bitname commons_math_doc +%var pkgname CSWajcmathdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:28:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:28:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[3652] csw/mgar/pkg Message-ID: Revision: 3652 http://gar.svn.sourceforge.net/gar/?rev=3652&view=rev Author: wbonnet Date: 2009-03-08 19:28:47 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcmath/ Removed Paths: ------------- csw/mgar/pkg/ajcmath/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:42:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3653] csw/mgar/pkg Message-ID: Revision: 3653 http://gar.svn.sourceforge.net/gar/?rev=3653&view=rev Author: wbonnet Date: 2009-03-08 19:42:45 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcnet/ csw/mgar/pkg/ajcnet/Makefile csw/mgar/pkg/ajcnet/branches/ csw/mgar/pkg/ajcnet/tags/ csw/mgar/pkg/ajcnet/trunk/ csw/mgar/pkg/ajcnet/trunk/Makefile csw/mgar/pkg/ajcnet/trunk/checksums csw/mgar/pkg/ajcnet/trunk/files/ csw/mgar/pkg/ajcnet/trunk/files/CSWajcnet.gspec csw/mgar/pkg/ajcnet/trunk/files/CSWajcnetdoc.gspec Added: csw/mgar/pkg/ajcnet/Makefile =================================================================== --- csw/mgar/pkg/ajcnet/Makefile (rev 0) +++ csw/mgar/pkg/ajcnet/Makefile 2009-03-08 19:42:45 UTC (rev 3653) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcnet/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcnet/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcnet/trunk/Makefile 2009-03-08 19:42:45 UTC (rev 3653) @@ -0,0 +1,54 @@ +SHORTNAME = net +GARVERSION = 2.0 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons net +define BLURB +Apache Jakarta Commons net : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcnet,) +DISTFILES += $(call admfiles,CSWajcnetdoc,) + +# Defines package description +SPKG_DESC_CSWajcnet = $(DESCRIPTION) +SPKG_DESC_CSWajcnetdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcnet = CSWajclogging CSWajccollect CSWajcbeanutils + +# Defines package content +PKGFILES_CSWajcnet = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcnet += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcnet/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcnet/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcnet/trunk/checksums 2009-03-08 19:42:45 UTC (rev 3653) @@ -0,0 +1,3 @@ +52fee591a8be0688a57af64ade1af237 download/commons-net-2.0.tar.gz +82bf2124f0409750525f68e7075c9fee download/CSWajcnet.gspec +b5b88f3af8255f933204a1a9f1031f94 download/CSWajcnetdoc.gspec Added: csw/mgar/pkg/ajcnet/trunk/files/CSWajcnet.gspec =================================================================== --- csw/mgar/pkg/ajcnet/trunk/files/CSWajcnet.gspec (rev 0) +++ csw/mgar/pkg/ajcnet/trunk/files/CSWajcnet.gspec 2009-03-08 19:42:45 UTC (rev 3653) @@ -0,0 +1,7 @@ +%var bitname commons_net +%var pkgname CSWajcnet +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcnet/trunk/files/CSWajcnetdoc.gspec =================================================================== --- csw/mgar/pkg/ajcnet/trunk/files/CSWajcnetdoc.gspec (rev 0) +++ csw/mgar/pkg/ajcnet/trunk/files/CSWajcnetdoc.gspec 2009-03-08 19:42:45 UTC (rev 3653) @@ -0,0 +1,7 @@ +%var bitname commons_net_doc +%var pkgname CSWajcnetdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:43:17 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[3654] csw/mgar/pkg Message-ID: Revision: 3654 http://gar.svn.sourceforge.net/gar/?rev=3654&view=rev Author: wbonnet Date: 2009-03-08 19:43:17 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcnet/ Removed Paths: ------------- csw/mgar/pkg/ajcnet/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:52:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:52:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[3655] csw/mgar/pkg Message-ID: Revision: 3655 http://gar.svn.sourceforge.net/gar/?rev=3655&view=rev Author: wbonnet Date: 2009-03-08 19:52:13 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcpool/ csw/mgar/pkg/ajcpool/Makefile csw/mgar/pkg/ajcpool/branches/ csw/mgar/pkg/ajcpool/tags/ csw/mgar/pkg/ajcpool/trunk/ csw/mgar/pkg/ajcpool/trunk/Makefile csw/mgar/pkg/ajcpool/trunk/checksums csw/mgar/pkg/ajcpool/trunk/files/ csw/mgar/pkg/ajcpool/trunk/files/CSWajcpool.gspec csw/mgar/pkg/ajcpool/trunk/files/CSWajcpooldoc.gspec Added: csw/mgar/pkg/ajcpool/Makefile =================================================================== --- csw/mgar/pkg/ajcpool/Makefile (rev 0) +++ csw/mgar/pkg/ajcpool/Makefile 2009-03-08 19:52:13 UTC (rev 3655) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcpool/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcpool/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcpool/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcpool/trunk/Makefile 2009-03-08 19:52:13 UTC (rev 3655) @@ -0,0 +1,54 @@ +SHORTNAME = pool +GARVERSION = 1.4 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons pool +define BLURB +Apache Jakarta Commons pool : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcpool,) +DISTFILES += $(call admfiles,CSWajcpooldoc,) + +# Defines package description +SPKG_DESC_CSWajcpool = $(DESCRIPTION) +SPKG_DESC_CSWajcpooldoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcpool = CSWajclogging CSWajcdigester + +# Defines package content +PKGFILES_CSWajcpool = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcpool += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcpool/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcpool/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcpool/trunk/checksums 2009-03-08 19:52:13 UTC (rev 3655) @@ -0,0 +1,3 @@ +668d72d233635b84c8557b911f6b7dbf download/commons-pool-1.4.tar.gz +1c9cd2c955587c0cfcbb6e0095370c45 download/CSWajcpool.gspec +e7de03999dd2059480423261d46d9fbf download/CSWajcpooldoc.gspec Added: csw/mgar/pkg/ajcpool/trunk/files/CSWajcpool.gspec =================================================================== --- csw/mgar/pkg/ajcpool/trunk/files/CSWajcpool.gspec (rev 0) +++ csw/mgar/pkg/ajcpool/trunk/files/CSWajcpool.gspec 2009-03-08 19:52:13 UTC (rev 3655) @@ -0,0 +1,7 @@ +%var bitname commons_pool +%var pkgname CSWajcpool +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcpool/trunk/files/CSWajcpooldoc.gspec =================================================================== --- csw/mgar/pkg/ajcpool/trunk/files/CSWajcpooldoc.gspec (rev 0) +++ csw/mgar/pkg/ajcpool/trunk/files/CSWajcpooldoc.gspec 2009-03-08 19:52:13 UTC (rev 3655) @@ -0,0 +1,7 @@ +%var bitname commons_pool_doc +%var pkgname CSWajcpooldoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 20:53:01 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 19:53:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3656] csw/mgar/pkg Message-ID: Revision: 3656 http://gar.svn.sourceforge.net/gar/?rev=3656&view=rev Author: wbonnet Date: 2009-03-08 19:53:01 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcpool/ Removed Paths: ------------- csw/mgar/pkg/ajcpool/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 21:13:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 20:13:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3657] csw/mgar/pkg Message-ID: Revision: 3657 http://gar.svn.sourceforge.net/gar/?rev=3657&view=rev Author: wbonnet Date: 2009-03-08 20:13:05 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcupload/ csw/mgar/pkg/ajcupload/Makefile csw/mgar/pkg/ajcupload/branches/ csw/mgar/pkg/ajcupload/tags/ csw/mgar/pkg/ajcupload/trunk/ csw/mgar/pkg/ajcupload/trunk/Makefile csw/mgar/pkg/ajcupload/trunk/checksums csw/mgar/pkg/ajcupload/trunk/files/ csw/mgar/pkg/ajcupload/trunk/files/CSWajcupload.gspec csw/mgar/pkg/ajcupload/trunk/files/CSWajcuploaddoc.gspec Added: csw/mgar/pkg/ajcupload/Makefile =================================================================== --- csw/mgar/pkg/ajcupload/Makefile (rev 0) +++ csw/mgar/pkg/ajcupload/Makefile 2009-03-08 20:13:05 UTC (rev 3657) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcupload/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcupload/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcupload/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcupload/trunk/Makefile 2009-03-08 20:13:05 UTC (rev 3657) @@ -0,0 +1,55 @@ +SHORTNAME = fileupload +GARVERSION = 1.2.1 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons upload +define BLURB +Apache Jakarta Commons FileUpload : robust, high-performance, file upload capability +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcupload,) +DISTFILES += $(call admfiles,CSWajcuploaddoc,) + +# Defines package description +SPKG_DESC_CSWajcupload = $(DESCRIPTION) +SPKG_DESC_CSWajcuploaddoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcupload = CSWajclogging CSWajcdigester + +# Defines package content +PKGFILES_CSWajcupload = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcupload += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/lib/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/site/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcupload/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcupload/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcupload/trunk/checksums 2009-03-08 20:13:05 UTC (rev 3657) @@ -0,0 +1,3 @@ +d8cccd7b9938c17169751ed978265673 download/commons-fileupload-1.2.1-bin.tar.gz +f07adfd3f198606e0ac4a312a8bdeab6 download/CSWajcupload.gspec +f3376106fd0d1ec93bded90deadf84d2 download/CSWajcuploaddoc.gspec Added: csw/mgar/pkg/ajcupload/trunk/files/CSWajcupload.gspec =================================================================== --- csw/mgar/pkg/ajcupload/trunk/files/CSWajcupload.gspec (rev 0) +++ csw/mgar/pkg/ajcupload/trunk/files/CSWajcupload.gspec 2009-03-08 20:13:05 UTC (rev 3657) @@ -0,0 +1,7 @@ +%var bitname commons_upload +%var pkgname CSWajcupload +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcupload/trunk/files/CSWajcuploaddoc.gspec =================================================================== --- csw/mgar/pkg/ajcupload/trunk/files/CSWajcuploaddoc.gspec (rev 0) +++ csw/mgar/pkg/ajcupload/trunk/files/CSWajcuploaddoc.gspec 2009-03-08 20:13:05 UTC (rev 3657) @@ -0,0 +1,7 @@ +%var bitname commons_upload_doc +%var pkgname CSWajcuploaddoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 21:14:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 20:14:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3658] csw/mgar/pkg Message-ID: Revision: 3658 http://gar.svn.sourceforge.net/gar/?rev=3658&view=rev Author: wbonnet Date: 2009-03-08 20:14:18 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcupload/ Removed Paths: ------------- csw/mgar/pkg/ajcupload/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 21:22:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 20:22:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3659] csw/mgar/pkg Message-ID: Revision: 3659 http://gar.svn.sourceforge.net/gar/?rev=3659&view=rev Author: wbonnet Date: 2009-03-08 20:22:51 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/ajcvalidator/ csw/mgar/pkg/ajcvalidator/Makefile csw/mgar/pkg/ajcvalidator/branches/ csw/mgar/pkg/ajcvalidator/tags/ csw/mgar/pkg/ajcvalidator/trunk/ csw/mgar/pkg/ajcvalidator/trunk/Makefile csw/mgar/pkg/ajcvalidator/trunk/checksums csw/mgar/pkg/ajcvalidator/trunk/files/ csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidator.gspec csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidatordoc.gspec Added: csw/mgar/pkg/ajcvalidator/Makefile =================================================================== --- csw/mgar/pkg/ajcvalidator/Makefile (rev 0) +++ csw/mgar/pkg/ajcvalidator/Makefile 2009-03-08 20:22:51 UTC (rev 3659) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ajcvalidator/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ajcvalidator/trunk/Makefile =================================================================== --- csw/mgar/pkg/ajcvalidator/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ajcvalidator/trunk/Makefile 2009-03-08 20:22:51 UTC (rev 3659) @@ -0,0 +1,55 @@ +SHORTNAME = validator +GARVERSION = 1.3.1 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons validator +define BLURB +Apache Jakarta Commons validator : XML-to-Java-object mapping utility +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcvalidator,) +DISTFILES += $(call admfiles,CSWajcvalidatordoc,) + +# Defines package description +SPKG_DESC_CSWajcvalidator = $(DESCRIPTION) +SPKG_DESC_CSWajcvalidatordoc = $(DESCRIPTION) documentation package + +# Defines dependencies +# REQUIRED_PKGS_CSWajcvalidator = No dependency + +# Defines package content +PKGFILES_CSWajcvalidator = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajcvalidator += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.3.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ajcvalidator/trunk/checksums =================================================================== --- csw/mgar/pkg/ajcvalidator/trunk/checksums (rev 0) +++ csw/mgar/pkg/ajcvalidator/trunk/checksums 2009-03-08 20:22:51 UTC (rev 3659) @@ -0,0 +1,3 @@ +e1f8c698fec1dc6a47e77a6a97e43fac download/commons-validator-1.3.1.tar.gz +3c2d91479db0b76f2051d51fe1f8219e download/CSWajcvalidator.gspec +268c8009ea77e6f8b47617841a69e753 download/CSWajcvalidatordoc.gspec Added: csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidator.gspec =================================================================== --- csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidator.gspec (rev 0) +++ csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidator.gspec 2009-03-08 20:22:51 UTC (rev 3659) @@ -0,0 +1,7 @@ +%var bitname commons_validator +%var pkgname CSWajcvalidator +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidatordoc.gspec =================================================================== --- csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidatordoc.gspec (rev 0) +++ csw/mgar/pkg/ajcvalidator/trunk/files/CSWajcvalidatordoc.gspec 2009-03-08 20:22:51 UTC (rev 3659) @@ -0,0 +1,7 @@ +%var bitname commons_validat_doc +%var pkgname CSWajcvalidatordoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 21:23:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 20:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3660] csw/mgar/pkg Message-ID: Revision: 3660 http://gar.svn.sourceforge.net/gar/?rev=3660&view=rev Author: wbonnet Date: 2009-03-08 20:23:51 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/ajcvalidator/ Removed Paths: ------------- csw/mgar/pkg/ajcvalidator/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun Mar 8 21:58:01 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 08 Mar 2009 20:58:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3661] csw/mgar/pkg/php5/trunk Message-ID: Revision: 3661 http://gar.svn.sourceforge.net/gar/?rev=3661&view=rev Author: valholla Date: 2009-03-08 20:58:01 +0000 (Sun, 08 Mar 2009) Log Message: ----------- working commit Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile Removed Paths: ------------- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/ Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -31,7 +31,7 @@ STRIP_DIRS += $(PHP5ROOT)/bin # Auxilliary files -DISTFILES += php.ini.CSW phpext +DISTFILES += php.ini.CSW phpext pear.conf.CSW DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh PACKAGES = CSWphp5 CSWphp5devel @@ -48,16 +48,7 @@ PKGFILES_CSWphp5devel = $(prefix)/php5/bin/php-config PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/date/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/pcre/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/pdo/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/ext/spl/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/main/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/php/include/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/regex/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/.*/standard/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/TSRM/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/include/php/Zend/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/include.* PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.* PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* @@ -85,7 +76,7 @@ CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --enable-spl=shared CONFIGURE_ARGS += --with-pcre-regex -CONFIGURE_ARGS += --with-pear +CONFIGURE_ARGS += --with-pear=shared # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 @@ -103,6 +94,9 @@ ginstall -m 0644 \ $(WORKDIR)/php.ini.CSW \ $(DESTDIR)$(prefix)/php5/lib + ginstall -m 0644 \ + $(WORKDIR)/pear.conf.CSW \ + $(DESTDIR)$(prefix)/php5/etc @$(MAKECOOKIE) post-configure-modulated: Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/checksums 2009-03-08 20:58:01 UTC (rev 3661) @@ -1,6 +1,7 @@ 7380ffecebd95c6edb317ef861229ebd download/php-5.2.6.tar.bz2 e79baa34abe18575a3d0220c21bd5e37 download/php.ini.CSW 90ae3cef3692d7e566c47d89fe39c43d download/phpext +2386fa2c49eb730b6344f49bb5ee0fb1 download/pear.conf.CSW de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh 8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -10,4 +10,3 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) PKGFILES_CSWphp5dom = .*/lib/php/extensions/.*/dom.* -PKGFILES_CSWphp5dom += .*/include/php/ext/dom/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -10,4 +10,3 @@ CONFIGURE_ARGS += --with-pcre-dir=$(prefix) PKGFILES_CSWphp5filter = .*/lib/php/extensions/.*/filter.* -PKGFILES_CSWphp5filter += .*/include/php/ext/filter/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -20,4 +20,3 @@ CONFIGURE_ARGS += --enable-gd-jis-conv PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.* -PKGFILES_CSWphp5gd += .*/include/php/ext/gd/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -9,4 +9,3 @@ CONFIGURE_ARGS += --enable-hash=shared PKGFILES_CSWphp5hash = .*/lib/php/extensions/.*/hash.* -PKGFILES_CSWphp5hash += .*/include/php/ext/hash/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -16,4 +16,3 @@ #PATCHFILES += iconv.diff PKGFILES_CSWphp5iconv = .*/lib/php/extensions/.*/iconv.* -PKGFILES_CSWphp5iconv += .*/include/php/ext/iconv/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -11,4 +11,3 @@ CONFIGURE_ARGS += --enable-mbregex=shared PKGFILES_CSWphp5mbstring = .*/lib/php/extensions/.*/mbstring.* -PKGFILES_CSWphp5mbstring += .*/include/php/ext/mbstring/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -9,4 +9,3 @@ CONFIGURE_ARGS += --enable-session=shared PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.* -PKGFILES_CSWphp5session += .*/include/php/ext/session/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -1,12 +1,8 @@ PHP5EXT_NAME = simplexml -PACKAGES += CSWphp5simplexml +## build this static, php can not run without it. +## it is more efficient to have this built into the php binary -CATALOGNAME_CSWphp5simplexml = php5_simplexml -SPKG_DESC_CSWphp5simplexml = simplexml Extention for PHP5 -REQUIRED_PKGS_CSWphp5simplexml = CSWphp5 CSWiconv CSWlibxml2 CSWzlib - -CONFIGURE_ARGS += --enable-simplexml=shared +CONFIGURE_ARGS += --enable-simplexml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) -PKGFILES_CSWphp5simplexml = .*/lib/php/extensions/.*/simplexml.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -10,4 +10,3 @@ CONFIGURE_ARGS += --enable-sqlite-utf8 PKGFILES_CSWphp5sqlite = .*/lib/php/extensions/.*/sqlite.* -PKGFILES_CSWphp5sqlite += .*/include/php/ext/sqlite/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -1,16 +1,5 @@ PHP5EXT_NAME = xml -PACKAGES += CSWphp5xml - -CATALOGNAME_CSWphp5xml = php5_xml -SPKG_DESC_CSWphp5xml = xml Extention for PHP5 -REQUIRED_PKGS_CSWphp5xml = CSWphp5 CSWexpat - -CONFIGURE_ARGS += --enable-xml=shared +CONFIGURE_ARGS += --enable-xml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) - -PKGFILES_CSWphp5xml = .*/lib/php/extensions/.*/xml.so -PKGFILES_CSWphp5xml += .*/lib/php/extensions/.*/xml.a -PKGFILES_CSWphp5xml += .*/include/php/ext/xml/.* -PKGFILES_CSWphp5xml += .*/include/php/ext/libxml/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -10,4 +10,3 @@ CONFIGURE_ARGS += --with-zlib-dir=$(prefix) PKGFILES_CSWphp5zip = .*/lib/php/extensions/.*/zip.* -PKGFILES_CSWphp5zip += .*/include/php/ext/zip/.* Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-03-08 20:23:51 UTC (rev 3660) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-03-08 20:58:01 UTC (rev 3661) @@ -1,11 +1,5 @@ PHP5EXT_NAME = zlib -PACKAGES += CSWphp5zlib -CATALOGNAME_CSWphp5zlib = php5_zlib -SPKG_DESC_CSWphp5zlib = zlib Extention for PHP5 -REQUIRED_PKGS_CSWphp5zlib = CSWphp5 CSWzlib +CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-zlib=shared,$(prefix) - -PKGFILES_CSWphp5zlib = .*/lib/php/extensions/.*/zlib.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 22:14:05 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 21:14:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3662] csw/mgar/pkg/java Message-ID: Revision: 3662 http://gar.svn.sourceforge.net/gar/?rev=3662&view=rev Author: wbonnet Date: 2009-03-08 21:14:05 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Fix some packages descriptions Modified Paths: -------------- csw/mgar/pkg/java/ajcio/trunk/Makefile csw/mgar/pkg/java/ajclang/trunk/Makefile csw/mgar/pkg/java/ajclogging/trunk/Makefile csw/mgar/pkg/java/ajcmath/trunk/Makefile csw/mgar/pkg/java/ajcnet/trunk/Makefile csw/mgar/pkg/java/ajcpool/trunk/Makefile csw/mgar/pkg/java/ajcupload/trunk/Makefile csw/mgar/pkg/java/ajcvalidator/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/java/ajcprimitives/ csw/mgar/pkg/java/ajcprimitives/branches/ csw/mgar/pkg/java/ajcprimitives/tags/ csw/mgar/pkg/java/ajcprimitives/trunk/ csw/mgar/pkg/java/ajcprimitives/trunk/Makefile csw/mgar/pkg/java/ajcprimitives/trunk/files/ csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitives.gspec csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitivesdoc.gspec Modified: csw/mgar/pkg/java/ajcio/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcio/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajcio/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons io +DESCRIPTION = Apache Jakarta Commons IO define BLURB -Apache Jakarta Commons io : XML-to-Java-object mapping utility +Apache Jakarta Commons IO : a collection of I/O utilities endef # Use jakarta sources Modified: csw/mgar/pkg/java/ajclang/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajclang/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajclang/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons lang +DESCRIPTION = Apache Jakarta Commons Lang define BLURB -Apache Jakarta Commons lang : XML-to-Java-object mapping utility +Apache Jakarta Commons Lang : provide extra functionality for classes in java.lang endef # Use jakarta sources Modified: csw/mgar/pkg/java/ajclogging/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajclogging/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajclogging/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons logging +DESCRIPTION = Apache Jakarta Commons Logging define BLURB -Apache Jakarta Commons logging : XML-to-Java-object mapping utility +Apache Jakarta Commons Logging : bridge between different logging libraries endef # Use jakarta sources Modified: csw/mgar/pkg/java/ajcmath/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcmath/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajcmath/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons math +DESCRIPTION = Apache Jakarta Commons Math define BLURB -Apache Jakarta Commons math : XML-to-Java-object mapping utility +Apache Jakarta Commons Math : Components addressing the most common practical problems endef # Use jakarta sources Modified: csw/mgar/pkg/java/ajcnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcnet/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajcnet/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons net +DESCRIPTION = Apache Jakarta Commons Net define BLURB -Apache Jakarta Commons net : XML-to-Java-object mapping utility +Apache Jakarta Commons Net : collection of network utilities, including FTP clients etc. endef # Use jakarta sources Modified: csw/mgar/pkg/java/ajcpool/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcpool/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajcpool/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons pool +DESCRIPTION = Apache Jakarta Commons Pool define BLURB -Apache Jakarta Commons pool : XML-to-Java-object mapping utility +Apache Jakarta Commons Pool : Object-pooling API endef # Use jakarta sources Property changes on: csw/mgar/pkg/java/ajcprimitives/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/java/ajcprimitives/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcprimitives/trunk/Makefile (rev 0) +++ csw/mgar/pkg/java/ajcprimitives/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -0,0 +1,54 @@ +SHORTNAME = primitives +GARVERSION = 1.0 + +GARNAME = commons-$(SHORTNAME) +CATEGORIES = java + +DESCRIPTION = Apache Jakarta Commons Primitives +define BLURB +Apache Jakarta Commons Primitives : work with types supporting Java primitive types +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/ +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# Set archive filename +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajcprimitives,) +DISTFILES += $(call admfiles,CSWajcprimitivesdoc,) + +# Defines package description +SPKG_DESC_CSWajcprimitives = $(DESCRIPTION) +SPKG_DESC_CSWajcprimitivesdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +REQUIRED_PKGS_CSWajcprimitives = CSWajclogging CSWajccollect CSWajcbeanutils + +# Defines package content +PKGFILES_CSWajcprimitives = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt +PKGFILES_CSWajcprimitives += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitives.gspec =================================================================== --- csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitives.gspec (rev 0) +++ csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitives.gspec 2009-03-08 21:14:05 UTC (rev 3662) @@ -0,0 +1,7 @@ +%var bitname commons_primitives +%var pkgname CSWajcprimitives +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitivesdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitivesdoc.gspec (rev 0) +++ csw/mgar/pkg/java/ajcprimitives/trunk/files/CSWajcprimitivesdoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) @@ -0,0 +1,7 @@ +%var bitname commons_primit_doc +%var pkgname CSWajcprimitivesdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information Modified: csw/mgar/pkg/java/ajcupload/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcupload/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajcupload/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,7 +4,7 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons upload +DESCRIPTION = Apache Jakarta Commons FileUpload define BLURB Apache Jakarta Commons FileUpload : robust, high-performance, file upload capability endef Modified: csw/mgar/pkg/java/ajcvalidator/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcvalidator/trunk/Makefile 2009-03-08 20:58:01 UTC (rev 3661) +++ csw/mgar/pkg/java/ajcvalidator/trunk/Makefile 2009-03-08 21:14:05 UTC (rev 3662) @@ -4,9 +4,9 @@ GARNAME = commons-$(SHORTNAME) CATEGORIES = java -DESCRIPTION = Apache Jakarta Commons validator +DESCRIPTION = Apache Jakarta Commons Validator define BLURB -Apache Jakarta Commons validator : XML-to-Java-object mapping utility +Apache Jakarta Commons Validator : This package addresses some of these issues of validation rules endef # Use jakarta sources This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 22:21:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 21:21:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3663] csw/mgar/pkg/java Message-ID: Revision: 3663 http://gar.svn.sourceforge.net/gar/?rev=3663&view=rev Author: wbonnet Date: 2009-03-08 21:21:05 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Fix some packages descriptions Modified Paths: -------------- csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchain.gspec csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchaindoc.gspec csw/mgar/pkg/java/ajccli/trunk/files/CSWajccli.gspec csw/mgar/pkg/java/ajccli/trunk/files/CSWajcclidoc.gspec csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodec.gspec csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodecdoc.gspec csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollect.gspec csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollectdoc.gspec csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec Modified: csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutils.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-beanutils/LICENSE.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE.txt for license information Modified: csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/files/CSWajcbeanutilsdoc.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-beanutils/LICENSE-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE-documentation.txt for license information Modified: csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchain.gspec =================================================================== --- csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchain.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchain.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-chain/LICENSE.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE.txt for license information Modified: csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchaindoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchaindoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajcchain/trunk/files/CSWajcchaindoc.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-chain/LICENSE-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE-documentation.txt for license information Modified: csw/mgar/pkg/java/ajccli/trunk/files/CSWajccli.gspec =================================================================== --- csw/mgar/pkg/java/ajccli/trunk/files/CSWajccli.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajccli/trunk/files/CSWajccli.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-cli/LICENSE.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE.txt for license information Modified: csw/mgar/pkg/java/ajccli/trunk/files/CSWajcclidoc.gspec =================================================================== --- csw/mgar/pkg/java/ajccli/trunk/files/CSWajcclidoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajccli/trunk/files/CSWajcclidoc.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-cli/LICENSE-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE-documentation.txt for license information Modified: csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodec.gspec =================================================================== --- csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodec.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodec.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-codec/LICENSE.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE.txt for license information Modified: csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodecdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodecdoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajccodec/trunk/files/CSWajccodecdoc.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-codec/LICENSE-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE-documentation.txt for license information Modified: csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollect.gspec =================================================================== --- csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollect.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollect.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-collections/LICENSE.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE.txt for license information Modified: csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollectdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollectdoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajccollections/trunk/files/CSWajccollectdoc.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/commons-collections/LICENSE-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/LICENSE-documentation.txt for license information Modified: csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigester.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/${GARNAME}/License.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Modified: csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec 2009-03-08 21:14:05 UTC (rev 3662) +++ csw/mgar/pkg/java/ajcdigester/trunk/files/CSWajcdigesterdoc.gspec 2009-03-08 21:21:05 UTC (rev 3663) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/${GARNAME}/License-documentation.txt for license information +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 22:27:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 21:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3664] csw/mgar/pkg/java Message-ID: Revision: 3664 http://gar.svn.sourceforge.net/gar/?rev=3664&view=rev Author: wbonnet Date: 2009-03-08 21:27:16 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Fix some packages dependencies Modified Paths: -------------- csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile csw/mgar/pkg/java/ajcchain/trunk/Makefile csw/mgar/pkg/java/ajccli/trunk/Makefile csw/mgar/pkg/java/ajccollections/trunk/Makefile Modified: csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile 2009-03-08 21:21:05 UTC (rev 3663) +++ csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile 2009-03-08 21:27:16 UTC (rev 3664) @@ -24,7 +24,7 @@ SPKG_DESC_CSWajcbeanutilsdoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajcbeanutils = CSWajcdigester CSWajclogging +# REQUIRED_PKGS_CSWajcbeanutils = # Defines package content PKGFILES_CSWajcbeanutils = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt Modified: csw/mgar/pkg/java/ajcchain/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcchain/trunk/Makefile 2009-03-08 21:21:05 UTC (rev 3663) +++ csw/mgar/pkg/java/ajcchain/trunk/Makefile 2009-03-08 21:27:16 UTC (rev 3664) @@ -24,7 +24,7 @@ SPKG_DESC_CSWajcchaindoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajcchain = CSWajcdigester CSWajclogging +# REQUIRED_PKGS_CSWajcchain = # Defines package content PKGFILES_CSWajcchain = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt Modified: csw/mgar/pkg/java/ajccli/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajccli/trunk/Makefile 2009-03-08 21:21:05 UTC (rev 3663) +++ csw/mgar/pkg/java/ajccli/trunk/Makefile 2009-03-08 21:27:16 UTC (rev 3664) @@ -25,7 +25,7 @@ SPKG_DESC_CSWajcclidoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajccli = CSWajclang +# REQUIRED_PKGS_CSWajccli = # Defines package content PKGFILES_CSWajccli = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt Modified: csw/mgar/pkg/java/ajccollections/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajccollections/trunk/Makefile 2009-03-08 21:21:05 UTC (rev 3663) +++ csw/mgar/pkg/java/ajccollections/trunk/Makefile 2009-03-08 21:27:16 UTC (rev 3664) @@ -24,7 +24,7 @@ SPKG_DESC_CSWajccollectdoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajccollect = CSWjunit +REQUIRED_PKGS_CSWajccollect = CSWajcconfig CSWajcdigester CSWajcemail CSWajcnet # Defines package content PKGFILES_CSWajccollect = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 23:00:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 22:00:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3665] csw/mgar/pkg/java Message-ID: Revision: 3665 http://gar.svn.sourceforge.net/gar/?rev=3665&view=rev Author: wbonnet Date: 2009-03-08 22:00:45 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/log4j/ csw/mgar/pkg/java/log4j/Makefile csw/mgar/pkg/java/log4j/branches/ csw/mgar/pkg/java/log4j/tags/ csw/mgar/pkg/java/log4j/trunk/ csw/mgar/pkg/java/log4j/trunk/Makefile csw/mgar/pkg/java/log4j/trunk/checksums csw/mgar/pkg/java/log4j/trunk/files/ csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec Added: csw/mgar/pkg/java/log4j/Makefile =================================================================== --- csw/mgar/pkg/java/log4j/Makefile (rev 0) +++ csw/mgar/pkg/java/log4j/Makefile 2009-03-08 22:00:45 UTC (rev 3665) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/java/log4j/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/java/log4j/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/log4j/trunk/Makefile (rev 0) +++ csw/mgar/pkg/java/log4j/trunk/Makefile 2009-03-08 22:00:45 UTC (rev 3665) @@ -0,0 +1,60 @@ +GARNAME = log4j +GARVERSION = 1.2.15 +CATEGORIES = java + +DESCRIPTION = Apache log4jLogging Services +define BLURB +A fast and flexible framework for logging application debugging messages +endef + +# Use jakarta sources +MASTER_SITES = http://apache.cict.fr/logging/$(GARNAME)/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://www.apache.org/dyn/closer.cgi/logging +UFILES_REGEX = (\d+(?:\.\d+)*) + +# Set archive filename +DISTFILES = apache-$(GARNAME)-$(GARVERSION).tar.gz + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWajclog4j,) +DISTFILES += $(call admfiles,CSWajclog4jdoc,) + +# Defines package description +SPKG_DESC_CSWajclog4j = $(DESCRIPTION) +SPKG_DESC_CSWajclog4jdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +# REQUIRED_PKGS_CSWajclog4j = No dependency + +# Defines package content +PKGFILES_CSWajclog4j = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWajclog4j += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract: + @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/apache-$(GARNAME)-$(GARVERSION) $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)-$(GARVERSION) + @$(MAKECOOKIE) + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.2.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt + @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt + @gcp -frp $(WORKSRC)/$(DISTNAME)/contribs $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -frp $(WORKSRC)/$(DISTNAME)/examples $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -frp $(WORKSRC)/$(DISTNAME)/site/* $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/java/log4j/trunk/checksums =================================================================== --- csw/mgar/pkg/java/log4j/trunk/checksums (rev 0) +++ csw/mgar/pkg/java/log4j/trunk/checksums 2009-03-08 22:00:45 UTC (rev 3665) @@ -0,0 +1,3 @@ +10f04abe4d68d5a89e8eb167e4e45e1a download/apache-log4j-1.2.15.tar.gz +5961f6f54d504a87ea5233b2c8d68a39 download/CSWajclog4j.gspec +992f7b8e2c26ff397614d8b4bc62ef4d download/CSWajclog4jdoc.gspec Added: csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec =================================================================== --- csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec (rev 0) +++ csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec 2009-03-08 22:00:45 UTC (rev 3665) @@ -0,0 +1,7 @@ +%var bitname log4j +%var pkgname CSWlog4j +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Added: csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec =================================================================== --- csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec (rev 0) +++ csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec 2009-03-08 22:00:45 UTC (rev 3665) @@ -0,0 +1,7 @@ +%var bitname log4j_doc +%var pkgname CSWlog4jdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 8 23:25:02 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 08 Mar 2009 22:25:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[3666] csw/mgar/pkg/libnet/trunk Message-ID: Revision: 3666 http://gar.svn.sourceforge.net/gar/?rev=3666&view=rev Author: hson Date: 2009-03-08 22:25:02 +0000 (Sun, 08 Mar 2009) Log Message: ----------- libnet: u_int8_t patch Modified Paths: -------------- csw/mgar/pkg/libnet/trunk/Makefile csw/mgar/pkg/libnet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libnet/trunk/files/mainpatch Modified: csw/mgar/pkg/libnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnet/trunk/Makefile 2009-03-08 22:00:45 UTC (rev 3665) +++ csw/mgar/pkg/libnet/trunk/Makefile 2009-03-08 22:25:02 UTC (rev 3666) @@ -19,6 +19,8 @@ DISTNAME = libnet +PATCHFILES = mainpatch + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/libnet/trunk/checksums =================================================================== --- csw/mgar/pkg/libnet/trunk/checksums 2009-03-08 22:00:45 UTC (rev 3665) +++ csw/mgar/pkg/libnet/trunk/checksums 2009-03-08 22:25:02 UTC (rev 3666) @@ -1,2 +1,3 @@ be845c41170d72c7db524f3411b50256 download/libnet-1.1.2.1.tar.gz f88f915ffd9e70173036d42db0d3642b download/CSWlibnet.gspec +ca847f8bf19895372cb392215badc008 download/mainpatch Added: csw/mgar/pkg/libnet/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/libnet/trunk/files/mainpatch (rev 0) +++ csw/mgar/pkg/libnet/trunk/files/mainpatch 2009-03-08 22:25:02 UTC (rev 3666) @@ -0,0 +1,152 @@ +Only in libnet: Makefile +Only in libnet: config.log +Only in libnet: config.status +Only in libnet/include: Makefile +Only in libnet/include: config.h +Only in libnet/include/libnet: Makefile +Only in libnet/include: libnet.h +diff --speed-large-files --minimal -ru libnet.orig/include/libnet.h.in libnet/include/libnet.h.in +--- libnet.orig/include/libnet.h.in 2004-01-17 08:51:19.000000000 +0100 ++++ libnet/include/libnet.h.in 2009-03-08 23:02:55.240388159 +0100 +@@ -113,6 +113,13 @@ + #include + #include + ++#ifdef __sun ++#define u_int8_t uint8_t ++#define u_int16_t uint16_t ++#define u_int32_t uint32_t ++#define u_int64_t uint64_t ++#endif ++ + #define LIBNET_VERSION "@LIBNET_VERSION@" + #define @ENDIANESS@ 1 + +Only in libnet/include: stamp-h1 +Only in libnet: libnet-config +Only in libnet/sample: Makefile +Only in libnet/sample: arp +Only in libnet/sample: arp.o +Only in libnet/sample: bgp4_hdr +Only in libnet/sample: bgp4_hdr.o +Only in libnet/sample: bgp4_notification +Only in libnet/sample: bgp4_notification.o +Only in libnet/sample: bgp4_open +Only in libnet/sample: bgp4_open.o +Only in libnet/sample: bgp4_update +Only in libnet/sample: bgp4_update.o +Only in libnet/sample: cdp +Only in libnet/sample: cdp.o +Only in libnet/sample: dhcp_discover +Only in libnet/sample: dhcp_discover.o +Only in libnet/sample: dns +Only in libnet/sample: dns.o +Only in libnet/sample: dot1x +Only in libnet/sample: dot1x.o +Only in libnet/sample: fddi_tcp1 +Only in libnet/sample: fddi_tcp1.o +Only in libnet/sample: fddi_tcp2 +Only in libnet/sample: fddi_tcp2.o +Only in libnet/sample: get_addr +Only in libnet/sample: get_addr.o +Only in libnet/sample: gre.o +Only in libnet/sample: icmp6_echoreq +Only in libnet/sample: icmp6_echoreq.o +Only in libnet/sample: icmp_echo_cq +Only in libnet/sample: icmp_echo_cq.o +Only in libnet/sample: icmp_redirect +Only in libnet/sample: icmp_redirect.o +Only in libnet/sample: icmp_timeexceed +Only in libnet/sample: icmp_timeexceed.o +Only in libnet/sample: icmp_timestamp +Only in libnet/sample: icmp_timestamp.o +Only in libnet/sample: icmp_unreach +Only in libnet/sample: icmp_unreach.o +Only in libnet/sample: ieee +Only in libnet/sample: ieee.o +Only in libnet/sample: isl +Only in libnet/sample: isl.o +Only in libnet/sample: mpls +Only in libnet/sample: mpls.o +Only in libnet/sample: ntp +Only in libnet/sample: ntp.o +Only in libnet/sample: ospf_hello +Only in libnet/sample: ospf_hello.o +Only in libnet/sample: ospf_lsa +Only in libnet/sample: ospf_lsa.o +Only in libnet/sample: ping_of_death +Only in libnet/sample: ping_of_death.o +Only in libnet/sample: rpc_tcp +Only in libnet/sample: rpc_tcp.o +Only in libnet/sample: rpc_udp +Only in libnet/sample: rpc_udp.o +Only in libnet/sample: smurf +Only in libnet/sample: smurf.o +Only in libnet/sample: stp +Only in libnet/sample: stp.o +Only in libnet/sample: synflood +Only in libnet/sample: synflood.o +Only in libnet/sample: synflood6 +Only in libnet/sample: synflood6.o +Only in libnet/sample: tcp1 +Only in libnet/sample: tcp1.o +Only in libnet/sample: tcp2 +Only in libnet/sample: tcp2.o +Only in libnet/sample: tring_tcp1 +Only in libnet/sample: tring_tcp1.o +Only in libnet/sample: tring_tcp2 +Only in libnet/sample: tring_tcp2.o +Only in libnet/sample: udp1 +Only in libnet/sample: udp1.o +Only in libnet/sample: udp2 +Only in libnet/sample: udp2.o +Only in libnet/src: Makefile +Only in libnet/src: libnet.a +Only in libnet/src: libnet_advanced.o +Only in libnet/src: libnet_asn1.o +Only in libnet/src: libnet_build_802.1q.o +Only in libnet/src: libnet_build_802.1x.o +Only in libnet/src: libnet_build_802.2.o +Only in libnet/src: libnet_build_802.3.o +Only in libnet/src: libnet_build_arp.o +Only in libnet/src: libnet_build_bgp.o +Only in libnet/src: libnet_build_cdp.o +Only in libnet/src: libnet_build_data.o +Only in libnet/src: libnet_build_dhcp.o +Only in libnet/src: libnet_build_dns.o +Only in libnet/src: libnet_build_ethernet.o +Only in libnet/src: libnet_build_fddi.o +Only in libnet/src: libnet_build_gre.o +Only in libnet/src: libnet_build_icmp.o +Only in libnet/src: libnet_build_igmp.o +Only in libnet/src: libnet_build_ip.o +Only in libnet/src: libnet_build_ipsec.o +Only in libnet/src: libnet_build_isl.o +Only in libnet/src: libnet_build_mpls.o +Only in libnet/src: libnet_build_ntp.o +Only in libnet/src: libnet_build_ospf.o +Only in libnet/src: libnet_build_rip.o +Only in libnet/src: libnet_build_rpc.o +Only in libnet/src: libnet_build_sebek.o +Only in libnet/src: libnet_build_snmp.o +Only in libnet/src: libnet_build_stp.o +Only in libnet/src: libnet_build_tcp.o +Only in libnet/src: libnet_build_token_ring.o +Only in libnet/src: libnet_build_udp.o +Only in libnet/src: libnet_build_vrrp.o +Only in libnet/src: libnet_checksum.o +Only in libnet/src: libnet_cq.o +Only in libnet/src: libnet_crc.o +Only in libnet/src: libnet_error.o +Only in libnet/src: libnet_if_addr.o +Only in libnet/src: libnet_init.o +Only in libnet/src: libnet_internal.o +Only in libnet/src: libnet_link_dlpi.o +Only in libnet/src: libnet_pblock.o +Only in libnet/src: libnet_port_list.o +Only in libnet/src: libnet_prand.o +Only in libnet/src: libnet_raw.o +Only in libnet/src: libnet_resolve.o +Only in libnet/src: libnet_version.o +Only in libnet/src: libnet_write.o +Only in libnet: version.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 23:36:52 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 22:36:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3667] csw/mgar/pkg/java Message-ID: Revision: 3667 http://gar.svn.sourceforge.net/gar/?rev=3667&view=rev Author: wbonnet Date: 2009-03-08 22:36:52 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Modified Paths: -------------- csw/mgar/pkg/java/log4j/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/java/junit/ csw/mgar/pkg/java/junit/branches/ csw/mgar/pkg/java/junit/tags/ csw/mgar/pkg/java/junit/trunk/ csw/mgar/pkg/java/junit/trunk/Makefile csw/mgar/pkg/java/junit/trunk/checksums csw/mgar/pkg/java/junit/trunk/files/ csw/mgar/pkg/java/junit/trunk/files/CSWjunit.gspec csw/mgar/pkg/java/junit/trunk/files/CSWjunitdoc.gspec csw/mgar/pkg/java/log4j/trunk/files/CSWlog4j.gspec csw/mgar/pkg/java/log4j/trunk/files/CSWlog4jdoc.gspec Removed Paths: ------------- csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec Property changes on: csw/mgar/pkg/java/junit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/java/junit/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/junit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/java/junit/trunk/Makefile 2009-03-08 22:36:52 UTC (rev 3667) @@ -0,0 +1,62 @@ +GARNAME = junit +GARVERSION = 4.5 +CATEGORIES = java + +DESCRIPTION = JUnit regression testing +define BLURB +JUnit is a program used to perform unit testing of virtually any software. JUnit testing is accomplished by writing test cases using Java, compiling these test cases and running the resultant classes with a JUnit Test Runner. +endef + +# Use jakarta sources +MASTER_SITES = http://ovh.dl.sourceforge.net/sourceforge/$(GARNAME)/ +DISTFILES = $(GARNAME)$(GARVERSION).zip + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*) + +# Defines two packages, lib and doc +DISTFILES += $(call admfiles,CSWjunit,) +DISTFILES += $(call admfiles,CSWjunitdoc,) + +# Defines package description +SPKG_DESC_CSWjunit = $(DESCRIPTION) +SPKG_DESC_CSWjunitdoc = $(DESCRIPTION) documentation package + +# Defines dependencies +# REQUIRED_PKGS_CSWjunit = No dependency + +# Defines package content +PKGFILES_CSWjunit = $(prefix)/share/doc/$(GARNAME)/License.html +PKGFILES_CSWjunit += $(prefix)/share/java/.* + +# Defines custom steps since java libs do not use autotools +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract: + @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)$(GARVERSION) $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)-$(GARVERSION) + @$(MAKECOOKIE) + +install-custom: + @ginstall -d $(DESTDIR)$(datadir)/java + @gcp -fp $(WORKSRC)/$(DISTNAME)/$(GARNAME)-$(GARVERSION).jar $(DESTDIR)$(datadir)/java + @( cd $(DESTDIR)$(datadir)/java ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-4.jar ; \ + ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar ) + @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/cpl-v10.html $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.html + @gcp -fp $(WORKSRC)/$(DISTNAME)/cpl-v10.html $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.html + @gcp -frp $(WORKSRC)/$(DISTNAME)/org $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -frp $(WORKSRC)/$(DISTNAME)/junit $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -frp $(WORKSRC)/$(DISTNAME)/doc $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -frp $(WORKSRC)/$(DISTNAME)/javadoc $(DESTDIR)$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKSRC)/$(DISTNAME)/*html $(DESTDIR)$(datadir)/doc/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/java/junit/trunk/checksums =================================================================== --- csw/mgar/pkg/java/junit/trunk/checksums (rev 0) +++ csw/mgar/pkg/java/junit/trunk/checksums 2009-03-08 22:36:52 UTC (rev 3667) @@ -0,0 +1,3 @@ +6d534ce2169e26cc3b6ac36072ce2f5f download/junit4.5.zip +482c26d868fc44b8f2afe3d7692d4b41 download/CSWjunit.gspec +3037d812a288d26a140aef1a8c4781f8 download/CSWjunitdoc.gspec Added: csw/mgar/pkg/java/junit/trunk/files/CSWjunit.gspec =================================================================== --- csw/mgar/pkg/java/junit/trunk/files/CSWjunit.gspec (rev 0) +++ csw/mgar/pkg/java/junit/trunk/files/CSWjunit.gspec 2009-03-08 22:36:52 UTC (rev 3667) @@ -0,0 +1,7 @@ +%var bitname junit +%var pkgname CSWjunit +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.html for license information Added: csw/mgar/pkg/java/junit/trunk/files/CSWjunitdoc.gspec =================================================================== --- csw/mgar/pkg/java/junit/trunk/files/CSWjunitdoc.gspec (rev 0) +++ csw/mgar/pkg/java/junit/trunk/files/CSWjunitdoc.gspec 2009-03-08 22:36:52 UTC (rev 3667) @@ -0,0 +1,7 @@ +%var bitname junit_doc +%var pkgname CSWjunitdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.html for license information Modified: csw/mgar/pkg/java/log4j/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/log4j/trunk/Makefile 2009-03-08 22:25:02 UTC (rev 3666) +++ csw/mgar/pkg/java/log4j/trunk/Makefile 2009-03-08 22:36:52 UTC (rev 3667) @@ -16,19 +16,19 @@ DISTFILES = apache-$(GARNAME)-$(GARVERSION).tar.gz # Defines two packages, lib and doc -DISTFILES += $(call admfiles,CSWajclog4j,) -DISTFILES += $(call admfiles,CSWajclog4jdoc,) +DISTFILES += $(call admfiles,CSWlog4j,) +DISTFILES += $(call admfiles,CSWlog4jdoc,) # Defines package description -SPKG_DESC_CSWajclog4j = $(DESCRIPTION) -SPKG_DESC_CSWajclog4jdoc = $(DESCRIPTION) documentation package +SPKG_DESC_CSWlog4j = $(DESCRIPTION) +SPKG_DESC_CSWlog4jdoc = $(DESCRIPTION) documentation package # Defines dependencies -# REQUIRED_PKGS_CSWajclog4j = No dependency +# REQUIRED_PKGS_CSWlog4j = No dependency # Defines package content -PKGFILES_CSWajclog4j = $(prefix)/share/doc/$(GARNAME)/License.txt -PKGFILES_CSWajclog4j += $(prefix)/share/java/.* +PKGFILES_CSWlog4j = $(prefix)/share/doc/$(GARNAME)/License.txt +PKGFILES_CSWlog4j += $(prefix)/share/java/.* # Defines custom steps since java libs do not use autotools WORKSRC = $(WORKDIR) Deleted: csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec =================================================================== --- csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec 2009-03-08 22:25:02 UTC (rev 3666) +++ csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec 2009-03-08 22:36:52 UTC (rev 3667) @@ -1,7 +0,0 @@ -%var bitname log4j -%var pkgname CSWlog4j -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Deleted: csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec =================================================================== --- csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec 2009-03-08 22:25:02 UTC (rev 3666) +++ csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec 2009-03-08 22:36:52 UTC (rev 3667) @@ -1,7 +0,0 @@ -%var bitname log4j_doc -%var pkgname CSWlog4jdoc -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information Copied: csw/mgar/pkg/java/log4j/trunk/files/CSWlog4j.gspec (from rev 3665, csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4j.gspec) =================================================================== --- csw/mgar/pkg/java/log4j/trunk/files/CSWlog4j.gspec (rev 0) +++ csw/mgar/pkg/java/log4j/trunk/files/CSWlog4j.gspec 2009-03-08 22:36:52 UTC (rev 3667) @@ -0,0 +1,7 @@ +%var bitname log4j +%var pkgname CSWlog4j +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information Copied: csw/mgar/pkg/java/log4j/trunk/files/CSWlog4jdoc.gspec (from rev 3665, csw/mgar/pkg/java/log4j/trunk/files/CSWajclog4jdoc.gspec) =================================================================== --- csw/mgar/pkg/java/log4j/trunk/files/CSWlog4jdoc.gspec (rev 0) +++ csw/mgar/pkg/java/log4j/trunk/files/CSWlog4jdoc.gspec 2009-03-08 22:36:52 UTC (rev 3667) @@ -0,0 +1,7 @@ +%var bitname log4j_doc +%var pkgname CSWlog4jdoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/License-documentation.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 23:40:13 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 22:40:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[3668] csw/mgar/pkg/x11/xproto/trunk Message-ID: Revision: 3668 http://gar.svn.sourceforge.net/gar/?rev=3668&view=rev Author: wbonnet Date: 2009-03-08 22:40:12 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Update to 7.0.15 Modified Paths: -------------- csw/mgar/pkg/x11/xproto/trunk/Makefile csw/mgar/pkg/x11/xproto/trunk/checksums Modified: csw/mgar/pkg/x11/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-03-08 22:36:52 UTC (rev 3667) +++ csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-03-08 22:40:12 UTC (rev 3668) @@ -1,5 +1,5 @@ GARNAME = xproto -GARVERSION = 7.0.14 +GARVERSION = 7.0.15 CATEGORIES = x11 DESCRIPTION = xproto Modified: csw/mgar/pkg/x11/xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/checksums 2009-03-08 22:36:52 UTC (rev 3667) +++ csw/mgar/pkg/x11/xproto/trunk/checksums 2009-03-08 22:40:12 UTC (rev 3668) @@ -1,2 +1,2 @@ -3575f7bea6d3314508f142575eb8e843 download/xproto-7.0.14.tar.gz +9186713de3ec8a9fdd6ec3f4c4534fde download/xproto-7.0.15.tar.gz 247ed3e654992c599b58ed5e8ae92e8b download/CSWxproto.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 8 23:57:06 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 22:57:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3669] csw/mgar/pkg/java/junit/Makefile Message-ID: Revision: 3669 http://gar.svn.sourceforge.net/gar/?rev=3669&view=rev Author: wbonnet Date: 2009-03-08 22:57:06 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/java/junit/Makefile Added: csw/mgar/pkg/java/junit/Makefile =================================================================== --- csw/mgar/pkg/java/junit/Makefile (rev 0) +++ csw/mgar/pkg/java/junit/Makefile 2009-03-08 22:57:06 UTC (rev 3669) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 00:04:07 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 23:04:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[3670] csw/mgar/pkg/x11/xproto/tags Message-ID: Revision: 3670 http://gar.svn.sourceforge.net/gar/?rev=3670&view=rev Author: wbonnet Date: 2009-03-08 23:04:05 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Release 7.0.15 to testing and submit to unstable Added Paths: ----------- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/files/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 00:05:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 23:05:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3671] csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15, REV=2009. 03.08-testing-b1 Message-ID: Revision: 3671 http://gar.svn.sourceforge.net/gar/?rev=3671&view=rev Author: wbonnet Date: 2009-03-08 23:05:51 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Release 7.0.15 to testing and submit to unstable Added Paths: ----------- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/Makefile csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/checksums csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/files/ Removed Paths: ------------- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/Makefile csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/checksums csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/files/ Copied: csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/Makefile (from rev 3670, csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/Makefile) =================================================================== --- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/Makefile (rev 0) +++ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/Makefile 2009-03-08 23:05:51 UTC (rev 3671) @@ -0,0 +1,22 @@ +GARNAME = xproto +GARVERSION = 7.0.15 +CATEGORIES = x11 + +DESCRIPTION = xproto +define BLURB +xproto +endef + +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWxproto) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +pre-install: + @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) + @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)/License.txt + +include gar/category.mk + Copied: csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/checksums (from rev 3670, csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/checksums) =================================================================== --- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/checksums (rev 0) +++ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/checksums 2009-03-08 23:05:51 UTC (rev 3671) @@ -0,0 +1,2 @@ +9186713de3ec8a9fdd6ec3f4c4534fde download/xproto-7.0.15.tar.gz +247ed3e654992c599b58ed5e8ae92e8b download/CSWxproto.gspec Deleted: csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/Makefile 2009-03-08 23:04:05 UTC (rev 3670) +++ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/Makefile 2009-03-08 23:05:51 UTC (rev 3671) @@ -1,22 +0,0 @@ -GARNAME = xproto -GARVERSION = 7.0.15 -CATEGORIES = x11 - -DESCRIPTION = xproto -define BLURB -xproto -endef - -MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWxproto) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -pre-install: - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)/License.txt - -include gar/category.mk - Deleted: csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/checksums 2009-03-08 23:04:05 UTC (rev 3670) +++ csw/mgar/pkg/x11/xproto/tags/xproto-7.0.15,REV=2009.03.08-testing-b1/trunk/checksums 2009-03-08 23:05:51 UTC (rev 3671) @@ -1,2 +0,0 @@ -9186713de3ec8a9fdd6ec3f4c4534fde download/xproto-7.0.15.tar.gz -247ed3e654992c599b58ed5e8ae92e8b download/CSWxproto.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 00:08:16 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 23:08:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3672] csw/mgar/pkg/java/log4j Message-ID: Revision: 3672 http://gar.svn.sourceforge.net/gar/?rev=3672&view=rev Author: wbonnet Date: 2009-03-08 23:08:16 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Release 1.2.15 to testing and submit to unstable Modified Paths: -------------- csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/checksums csw/mgar/pkg/java/log4j/trunk/checksums Added Paths: ----------- csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/ Modified: csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/checksums =================================================================== --- csw/mgar/pkg/java/log4j/trunk/checksums 2009-03-08 22:40:12 UTC (rev 3668) +++ csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/checksums 2009-03-08 23:08:16 UTC (rev 3672) @@ -1,3 +1,3 @@ 10f04abe4d68d5a89e8eb167e4e45e1a download/apache-log4j-1.2.15.tar.gz -5961f6f54d504a87ea5233b2c8d68a39 download/CSWajclog4j.gspec -992f7b8e2c26ff397614d8b4bc62ef4d download/CSWajclog4jdoc.gspec +5961f6f54d504a87ea5233b2c8d68a39 download/CSWlog4j.gspec +992f7b8e2c26ff397614d8b4bc62ef4d download/CSWlog4jdoc.gspec Modified: csw/mgar/pkg/java/log4j/trunk/checksums =================================================================== --- csw/mgar/pkg/java/log4j/trunk/checksums 2009-03-08 23:05:51 UTC (rev 3671) +++ csw/mgar/pkg/java/log4j/trunk/checksums 2009-03-08 23:08:16 UTC (rev 3672) @@ -1,3 +1,3 @@ 10f04abe4d68d5a89e8eb167e4e45e1a download/apache-log4j-1.2.15.tar.gz -5961f6f54d504a87ea5233b2c8d68a39 download/CSWajclog4j.gspec -992f7b8e2c26ff397614d8b4bc62ef4d download/CSWajclog4jdoc.gspec +5961f6f54d504a87ea5233b2c8d68a39 download/CSWlog4j.gspec +992f7b8e2c26ff397614d8b4bc62ef4d download/CSWlog4jdoc.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 00:10:55 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 08 Mar 2009 23:10:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[3673] csw/mgar/pkg/java/junit/tags/junit-4.5, REV=2009.03. 08-testing-b1/ Message-ID: Revision: 3673 http://gar.svn.sourceforge.net/gar/?rev=3673&view=rev Author: wbonnet Date: 2009-03-08 23:10:55 +0000 (Sun, 08 Mar 2009) Log Message: ----------- Release 4.5 to testing and submit to unstable Added Paths: ----------- csw/mgar/pkg/java/junit/tags/junit-4.5,REV=2009.03.08-testing-b1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 9 00:53:45 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 08 Mar 2009 23:53:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3674] csw/mgar/pkg Message-ID: Revision: 3674 http://gar.svn.sourceforge.net/gar/?rev=3674&view=rev Author: hson Date: 2009-03-08 23:53:44 +0000 (Sun, 08 Mar 2009) Log Message: ----------- pcb: Initial commit Added Paths: ----------- csw/mgar/pkg/pcb/ csw/mgar/pkg/pcb/branches/ csw/mgar/pkg/pcb/tags/ csw/mgar/pkg/pcb/trunk/ csw/mgar/pkg/pcb/trunk/Makefile csw/mgar/pkg/pcb/trunk/checksums csw/mgar/pkg/pcb/trunk/files/ Property changes on: csw/mgar/pkg/pcb/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pcb/trunk/Makefile 2009-03-08 23:53:44 UTC (rev 3674) @@ -0,0 +1,42 @@ +GARNAME = pcb +GARVERSION = 20081128 +CATEGORIES = apps + +DESCRIPTION = PCB is a tool for the layout of printed circuit boards +define BLURB + PCB is an interactive printed circuit board editor for the X11 window system. + PCB includes a rats nest feature, design rule checking, and can provide + industry standard RS-274-X (Gerber), NC drill, and centroid data (X-Y data) + output for use in the board fabrication and assembly process. PCB offers high + end features such as an autorouter and trace optimizer which can tremendously + reduce layout time. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://pcb.gpleda.org + +LICENSE = COPYING + +#REQUIRED_PKGS = CSWggettextrt CSWiconv + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=73743 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +# Patch submitted to upstream, pending new release +#PATCHFILES = iptc-dataset.patch + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-update-desktop-database +CONFIGURE_ARGS += --disable-update-mime-database + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums (rev 0) +++ csw/mgar/pkg/pcb/trunk/checksums 2009-03-08 23:53:44 UTC (rev 3674) @@ -0,0 +1 @@ +e192ee993b04749f82dd3e8b529d40c0 download/pcb-20081128.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 9 03:59:43 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 09 Mar 2009 02:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[3675] csw/mgar/pkg Message-ID: Revision: 3675 http://gar.svn.sourceforge.net/gar/?rev=3675&view=rev Author: hson Date: 2009-03-09 02:59:43 +0000 (Mon, 09 Mar 2009) Log Message: ----------- htmldoc: Initial commit Added Paths: ----------- csw/mgar/pkg/htmldoc/ csw/mgar/pkg/htmldoc/branches/ csw/mgar/pkg/htmldoc/tags/ csw/mgar/pkg/htmldoc/trunk/ csw/mgar/pkg/htmldoc/trunk/Makefile csw/mgar/pkg/htmldoc/trunk/checksums csw/mgar/pkg/htmldoc/trunk/files/ csw/mgar/pkg/htmldoc/trunk/files/mainpatch Property changes on: csw/mgar/pkg/htmldoc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/htmldoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/htmldoc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/htmldoc/trunk/Makefile 2009-03-09 02:59:43 UTC (rev 3675) @@ -0,0 +1,34 @@ +GARNAME = htmldoc +GARVERSION = 1.8.27 +CATEGORIES = apps + +DESCRIPTION = converts HTML files and web pages into indexed HTML PostScript and PDF +define BLURB + HTMLDOC converts Hyper-Text Markup Language ("HTML") files and web pages into + indexed HTML, Adobe\xAE PostScript\xAE, or Adobe Portable Document Format ("PDF") + files. +endef + +MASTER_SITES = http://ftp.easysw.com/pub/htmldoc/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 + +SPKG_SOURCEURL = http://www.htmldoc.org + +LICENSE = COPYING.txt + +REQUIRED_PKGS = CSWjpeg CSWosslrt CSWpng CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-source.tar.bz2 + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PATCHFILES = mainpatch + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/htmldoc/trunk/checksums =================================================================== --- csw/mgar/pkg/htmldoc/trunk/checksums (rev 0) +++ csw/mgar/pkg/htmldoc/trunk/checksums 2009-03-09 02:59:43 UTC (rev 3675) @@ -0,0 +1,2 @@ +35589e7b8fe9c54e11be87cd5aec4dcc download/htmldoc-1.8.27-source.tar.bz2 +b44e823414126306dd5c8d222065e00c download/mainpatch Added: csw/mgar/pkg/htmldoc/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/htmldoc/trunk/files/mainpatch (rev 0) +++ csw/mgar/pkg/htmldoc/trunk/files/mainpatch 2009-03-09 02:59:43 UTC (rev 3675) @@ -0,0 +1,103 @@ +diff --speed-large-files --minimal -ru htmldoc-1.8.27.orig/configure htmldoc-1.8.27/configure +--- htmldoc-1.8.27.orig/configure 2006-08-02 21:36:56.000000000 +0200 ++++ htmldoc-1.8.27/configure 2009-03-09 00:49:13.000000000 +0100 +@@ -6106,7 +6106,7 @@ + ;; + SunOS*) + if test -z "$OPTIM"; then +- OPTIM="-xO4 -xarch=generic" ++ OPTIM="-xO4" + fi + ;; + UNIX_SV*) +diff --speed-large-files --minimal -ru htmldoc-1.8.27.orig/data/Makefile htmldoc-1.8.27/data/Makefile +--- htmldoc-1.8.27.orig/data/Makefile 2004-05-10 03:14:53.000000000 +0200 ++++ htmldoc-1.8.27/data/Makefile 2009-03-08 20:14:12.000000000 +0100 +@@ -53,11 +53,11 @@ + # + + install: +- if [ ! -d $(datadir)/htmldoc/data ]; then\ +- $(MKDIR) $(datadir)/htmldoc/data;\ ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ + fi +- $(CP) $(FILES) $(datadir)/htmldoc/data +- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* ++ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* + + + # +diff --speed-large-files --minimal -ru htmldoc-1.8.27.orig/doc/Makefile htmldoc-1.8.27/doc/Makefile +--- htmldoc-1.8.27.orig/doc/Makefile 2005-10-28 22:32:59.000000000 +0200 ++++ htmldoc-1.8.27/doc/Makefile 2009-03-08 20:14:12.000000000 +0100 +@@ -57,16 +57,16 @@ + # + + install: $(DOCUMENTS) +- if [ ! -d $(datadir)/doc/htmldoc ]; then\ +- $(MKDIR) $(datadir)/doc/htmldoc;\ ++ if [ ! -d $(DESTDIR)$(datadir)/doc/htmldoc ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\ + fi +- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc +- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* +- if [ ! -d $(mandir)/man1 ]; then\ +- $(MKDIR) $(mandir)/man1;\ ++ $(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/* ++ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\ ++ $(MKDIR) $(DESTDIR)$(mandir)/man1;\ + fi +- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 +- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 ++ $(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1 ++ $(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1 + + + # +diff --speed-large-files --minimal -ru htmldoc-1.8.27.orig/fonts/Makefile htmldoc-1.8.27/fonts/Makefile +--- htmldoc-1.8.27.orig/fonts/Makefile 2005-10-28 22:32:59.000000000 +0200 ++++ htmldoc-1.8.27/fonts/Makefile 2009-03-08 20:14:12.000000000 +0100 +@@ -74,15 +74,15 @@ + # + + install: +- echo "Installing font files in $(datadir)/htmldoc/fonts..." +- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ +- $(MKDIR) $(datadir)/htmldoc/fonts;\ ++ echo "Installing font files in $(DESTDIR)$(datadir)/htmldoc/fonts..." ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\ + fi + for font in $(FONTS); do \ +- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ +- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \ + done +- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/* ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/* + + + # +diff --speed-large-files --minimal -ru htmldoc-1.8.27.orig/htmldoc/Makefile htmldoc-1.8.27/htmldoc/Makefile +--- htmldoc-1.8.27.orig/htmldoc/Makefile 2005-10-28 22:32:59.000000000 +0200 ++++ htmldoc-1.8.27/htmldoc/Makefile 2009-03-08 20:14:12.000000000 +0100 +@@ -50,11 +50,11 @@ + # + + install: all +- if [ ! -d $(bindir) ]; then\ +- $(MKDIR) $(bindir);\ ++ if [ ! -d $(DESTDIR)$(bindir) ]; then\ ++ $(MKDIR) $(DESTDIR)$(bindir);\ + fi +- cp htmldoc$(EXEEXT) $(bindir) +- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT) ++ cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir) ++ chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT) + + + # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Mon Mar 9 14:52:18 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Mon, 09 Mar 2009 13:52:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3676] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 3676 http://gar.svn.sourceforge.net/gar/?rev=3676&view=rev Author: rmacduff Date: 2009-03-09 13:52:18 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Building on 8x, 8s, and 10x. Need to work on 10s. Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2009-03-09 02:59:43 UTC (rev 3675) +++ csw/mgar/pkg/sed/trunk/Makefile 2009-03-09 13:52:18 UTC (rev 3676) @@ -14,8 +14,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +# Use GNU because of issue with syntax containing ellipsis in lib/regcomp.c. +# See http://markmail.org/message/7ki46iiok3ddu3sa +GARCOMPILER = GNU +PREREQUISITE_PKGS = CSWiconv + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g +CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw +CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw +CONFIGURE_ARGS += --with-included-gettext + TEST_TARGET = check include gar/category.mk + +# Make sure we are using gnu tools (esp. sed) +PATH := /opt/csw/gnu:$(PATH) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Mar 9 14:55:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 09 Mar 2009 13:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[3677] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 3677 http://gar.svn.sourceforge.net/gar/?rev=3677&view=rev Author: bdwalton Date: 2009-03-09 13:55:23 +0000 (Mon, 09 Mar 2009) Log Message: ----------- correct small bracketing error in dynamic dependencies Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-03-09 13:52:18 UTC (rev 3676) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-03-09 13:55:23 UTC (rev 3677) @@ -282,7 +282,7 @@ $(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ - echo "$(shell /usr/bin/pkginfo $(PKG) || echo "P $(PKG) - " | awk '{ $$1 = "P"; print } ')"; \ + echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \ ) \ )) >$@) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 9 15:00:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Mar 2009 14:00:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3678] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 3678 http://gar.svn.sourceforge.net/gar/?rev=3678&view=rev Author: dmichelsen Date: 2009-03-09 14:00:31 +0000 (Mon, 09 Mar 2009) Log Message: ----------- mGAR v2: Fix dynamic copyright generation on packages with explicit gspec-files Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-03-09 13:55:23 UTC (rev 3677) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-03-09 14:00:31 UTC (rev 3678) @@ -394,15 +394,15 @@ define licensefile $(strip $(or - $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))) - $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), - ) + $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))) + $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), + ) ) endef merge-license-%: $(WORKDIR) $(_DBG)$(if $(and $(LICENSE_$*),$(LICENSE_FULL_$*)),$(error Both LICENSE_$* and LICENSE_FULL_$* have been specified where only one is allowed)) \ - $(if $(and $(filter $*,$(PACKAGES)),$(or $(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \ + $(if $(and $(filter $*,$(_PKG_SPECS)),$(or $(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \ LICENSEFILE=$(or $(call licensefile,$*),$(if $(_LICENSE_IS_DEFAULT),,$(error Cannot find license file for package $*))); \ LICENSEDIR=$(call licensedir,$*); \ if [ -n "$$LICENSEFILE" ]; then \ @@ -414,8 +414,10 @@ cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ fi \ ) + $(MAKECOOKIE) merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC)) + $(DONADA) # package - Use the mkpackage utility to create Solaris packages # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 9 17:11:42 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 09 Mar 2009 16:11:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3679] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 3679 http://gar.svn.sourceforge.net/gar/?rev=3679&view=rev Author: valholla Date: 2009-03-09 16:11:42 +0000 (Mon, 09 Mar 2009) Log Message: ----------- working copy checkin Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/files/configure_def.mk Added Paths: ----------- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2009-03-09 14:00:31 UTC (rev 3678) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-03-09 16:11:42 UTC (rev 3679) @@ -1,63 +1,25 @@ -GARNAME = gcc -GARVERSION = 4.3.3 -CATEGORIES = lang +GARNAME = gcc +GARVERSION = 4.3.3 +CATEGORIES = lang -DESCRIPTION = The GNU Compiler Collection +DESCRIPTION = The GNU Compiler Collection define BLURB The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...). endef -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 MASTER_SITES = http://gcc.gnu.org/ -SPKG_SOURCEURL = http://gcc.releasenotes.org/releases/ # We define upstream file regex so we can be notifed # of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -### Scripts Section ### - -## Directory to do all the work from -OBJECT_DIR = $(WORKDIR)/$(DISTNAME)/objdir -## Change default $(WORKSRC) to the $(OBJECT_DIR) -WORKSRC = $(OBJECT_DIR) - -## After sucessful source extraction -## Create $(OBJECT_DIR) to build in -post-extract-$(addprefix post-extract-,$(MODULATIONS)): - echo "==> Creating Object Dir for Building" - @( mkdir $(OBJECT_DIR) ) - $(DONADA) - -## Override standard configure -CONFIGURE_SCRIPTS = objdir -## instead of changing to $(WORKSRC) and running configure -## Run it from the $(OBJECT_DIR) -configure-objdir: - echo "==> Running Configure from $(OBJECT_DIR)" - cd $(OBJECT_DIR) && $(CONFIGURE_ENV) ../configure $(CONFIGURE_ARGS) - $(DONADA) - -## Package Check will fail for self dependencies -## i.e. CSWgcc4core is dependent on CSWgcc4corert -## if CSWgcc4corert is not installed on the build system -## Package Creation will fail and the remaining packages -## will not get created. -## ****** Run checkpkg Manually ***** -ENABLE_CHECK = 0 - -## Tests take a very long time -TEST_SCRIPTS = skip - -test-skip: - $(DONADA) - -## For cleanliness I moved the Configuration Definition -## And Packaging Definitions to their own file +## For cleanliness I split the Configuration into separate files +include files/gar_override.mk include files/configure_def.mk +include files/pkg_scripts.mk include files/package_def.mk include gar/category.mk Modified: csw/mgar/pkg/gcc4/trunk/files/configure_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/configure_def.mk 2009-03-09 14:00:31 UTC (rev 3678) +++ csw/mgar/pkg/gcc4/trunk/files/configure_def.mk 2009-03-09 16:11:42 UTC (rev 3679) @@ -1,32 +1,23 @@ -### Configure Section ### -CPPFLAGS = -I/opt/csw/include -CFLAGS = -I/opt/csw/include -CXXFLAGS = -I/opt/csw/include -LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\\\\\$\$ISALIST -R/opt/csw/lib -OPTFLAGS = - ## Install everythong /opt/csw/gcc4 instead of /opt/csw -BUILD_PREFIX = /opt/csw/gcc4 +prefix = /opt/csw/gcc4 -OBJECT_DIR = $(WORKDIR)/$(DISTNAME)/objdir -WORKSRC = $(OBJECT_DIR) - -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --exec-prefix=$(prefix) CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-mpfr=$(prefix) -CONFIGURE_ARGS += --with-gmp=$(prefix) +CONFIGURE_ARGS += --with-mpfr=/opt/csw +CONFIGURE_ARGS += --with-gmp=/opt/csw CONFIGURE_ARGS += --with-gnu-as CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas CONFIGURE_ARGS += --without-gnu-ld CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld -CONFIGURE_ARGS += --with-build-time-tools=$(bindir) +CONFIGURE_ARGS += --with-build-time-tools=/opt/csw/bin ## Do not try to build Ada ## Ada must be build with using GCC because the source uses some Ada Code ## Checkout gcc4ada* packages from svn if you wish to build Ada CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc -CONFIGURE_ARGS += LDFLAGS=-R/opt/csw/lib + Added: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-09 16:11:42 UTC (rev 3679) @@ -0,0 +1,27 @@ + + +WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL) +COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL) +INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL) +OBJECT_DIR = $(WORKDIR)/$(DISTNAME)/objdir +WORKSRC = $(OBJECT_DIR) +DIRPATHS = +OPTFLAGS = +CONFIG_SHELL = /opt/csw/bin/bash + + +CPPFLAGS = -I/opt/csw/include +CFLAGS = -I/opt/csw/include +CXXFLAGS = -I/opt/csw/include +LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\\\\\$\$ISALIST -R/opt/csw/lib +BOOT_CFLAGS = $(CFLAGS) -g -O2 +BOOT_LDFLAGS = $(LDFLAGS) + +COMMON_EXPORTS += CONFIG_SHELL BOOT_CFLAGS BOOT_LDFLAGS + +CONFIGURE_SCRIPTS = objdir +TEST_SCRIPTS = skip + +## Run checkpkg Manually +ENABLE_CHECK = 0 + Added: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-09 16:11:42 UTC (rev 3679) @@ -0,0 +1,17 @@ + +## Create $(OBJECT_DIR) to build in +post-extract-$(addprefix post-extract-,$(MODULATIONS)): + echo "==> Creating Object Dir for Building" + @( mkdir $(OBJECT_DIR) ) + $(DONADA) + +## instead of changing to $(WORKSRC) and running configure +## Run it from the $(OBJECT_DIR) +configure-objdir: + echo "==> Running Configure from $(OBJECT_DIR)" + cd $(OBJECT_DIR) && $(CONFIGURE_ENV) ../configure $(CONFIGURE_ARGS) + $(DONADA) + +test-skip: + $(DONADA) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 9 18:08:49 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 09 Mar 2009 17:08:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[3680] csw/mgar/pkg/lzop/trunk/Makefile Message-ID: Revision: 3680 http://gar.svn.sourceforge.net/gar/?rev=3680&view=rev Author: bonivart Date: 2009-03-09 17:08:49 +0000 (Mon, 09 Mar 2009) Log Message: ----------- lzop: fix version field Modified Paths: -------------- csw/mgar/pkg/lzop/trunk/Makefile Modified: csw/mgar/pkg/lzop/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzop/trunk/Makefile 2009-03-09 16:11:42 UTC (rev 3679) +++ csw/mgar/pkg/lzop/trunk/Makefile 2009-03-09 17:08:49 UTC (rev 3680) @@ -1,5 +1,8 @@ GARNAME = lzop -GARVERSION = 1.02rc1 +GARVERSION = 1.02 +RELEASE = rc1 +DISTVERSION = $(GARVERSION)$(RELEASE) +DISTNAME = $(GARNAME)-$(DISTVERSION) CATEGORIES = utils DESCRIPTION = LZO file compressor @@ -11,7 +14,7 @@ endef MASTER_SITES = http://www.lzop.org/download/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)$(RELEASE).tar.gz PACKAGES = CSWlzop CATALOGNAME = lzop @@ -29,6 +32,8 @@ include gar/category.mk +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + DOCS = AUTHORS NEWS README THANKS doc/magic DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Mon Mar 9 18:31:51 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Mon, 09 Mar 2009 17:31:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3681] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 3681 http://gar.svn.sourceforge.net/gar/?rev=3681&view=rev Author: rmacduff Date: 2009-03-09 17:31:50 +0000 (Mon, 09 Mar 2009) Log Message: ----------- gsed: Corrected package name to CSWgsed (from CSWsed) Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2009-03-09 17:08:49 UTC (rev 3680) +++ csw/mgar/pkg/sed/trunk/Makefile 2009-03-09 17:31:50 UTC (rev 3681) @@ -2,12 +2,17 @@ GARVERSION = 4.1.5 CATEGORIES = utils +PACKAGES = CSWgsed +CATALOGNAME_CSWgsed = gsed + DESCRIPTION = GNU Stream Editor define BLURB Sed, the GNU Stream Editor, copies the named files (standard input default) to the standard output, edited according to a script of commands. endef +SPKG_DESC_CSWgsed = $(DESCRIPTION) + MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 22:15:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Mar 2009 21:15:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[3682] csw/mgar/pkg/java/log4j/trunk/Makefile Message-ID: Revision: 3682 http://gar.svn.sourceforge.net/gar/?rev=3682&view=rev Author: wbonnet Date: 2009-03-09 21:15:51 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Add missing whitespace from description Modified Paths: -------------- csw/mgar/pkg/java/log4j/trunk/Makefile Modified: csw/mgar/pkg/java/log4j/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/log4j/trunk/Makefile 2009-03-09 17:31:50 UTC (rev 3681) +++ csw/mgar/pkg/java/log4j/trunk/Makefile 2009-03-09 21:15:51 UTC (rev 3682) @@ -2,7 +2,7 @@ GARVERSION = 1.2.15 CATEGORIES = java -DESCRIPTION = Apache log4jLogging Services +DESCRIPTION = Apache log4j Logging Services define BLURB A fast and flexible framework for logging application debugging messages endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 23:12:03 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Mar 2009 22:12:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3683] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 3683 http://gar.svn.sourceforge.net/gar/?rev=3683&view=rev Author: wbonnet Date: 2009-03-09 22:12:03 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Udapte to 1.2.12 Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus/trunk/checksums csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2009-03-09 21:15:51 UTC (rev 3682) +++ csw/mgar/pkg/dbus/trunk/Makefile 2009-03-09 22:12:03 UTC (rev 3683) @@ -19,22 +19,22 @@ SPKG_DESC_CSWlibdbusdev = $(DESCRIPTION) development package DISTFILES += $(call admfiles,CSWdbus, preinstall, ) -DISTFILES += cswdbus DISTFILES += $(call admfiles,CSWlibdbusdev, ) DISTFILES += $(call admfiles,CSWlibdbus, ) +DISTFILES += cswdbus # Dynamic CSWlibdbusdev prototype PKGFILES_CSWlibdbusdev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibdbusdev += $(includedir)/include/(.*) -PKGFILES_CSWlibdbusdev += $(libdir)/dbus-1.0/(.*) -PKGFILES_CSWlibdbusdev += $(libdir)/libdbus-1.a -PKGFILES_CSWlibdbusdev += $(libdir)/pkgconfig/(.*) +PKGFILES_CSWlibdbusdev += $(libdir)/dbus-1.0/.* +# PKGFILES_CSWlibdbusdev += $(includedir)/include/(.*) +# PKGFILES_CSWlibdbusdev += $(libdir)/libdbus-1.a +# PKGFILES_CSWlibdbusdev += $(libdir)/pkgconfig/(.*) # Dynamic CSWlibdbus prototype PKGFILES_CSWlibdbus = $(PKGFILES_RT) -PKGFILES_CSWlibdbus += $(libdir)/libdbus-1.la -PKGFILES_CSWlibdbus += $(libdir)/(.*)\.so -PKGFILES_CSWlibdbus += $(libdir)/(.*)\.so\.(.*) +#PKGFILES_CSWlibdbus += $(libdir)/libdbus-1.la +#PKGFILES_CSWlibdbus += $(libdir)/(.*)\.so +#PKGFILES_CSWlibdbus += $(libdir)/(.*)\.so\.(.*) # Dependencies tracking REQUIRED_PKGS_CSWdbus += CSWexpat CSWlibdbus CSWcswclassutils @@ -56,8 +56,13 @@ for i in *.conf ; do mv $$i $$i.CSW ; done && cd $$OLDDIR ; \ ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/opt/csw/init.d ; \ cp -fr $(FILEDIR)/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/opt/csw/init.d ; \ - rm -f $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus ; \ + ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/ ; \ ln -s ../init.d/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus ; ) + @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/dbus + @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/libdbus + @cp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$GARNAME)-$(GARVERSION)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/dbus/License.txt + @cp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$GARNAME)-$(GARVERSION)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/libdbus/License.txt + @cp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$GARNAME)-$(GARVERSION)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/libdbus/License-devel.txt @$(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2009-03-09 21:15:51 UTC (rev 3682) +++ csw/mgar/pkg/dbus/trunk/checksums 2009-03-09 22:12:03 UTC (rev 3683) @@ -1,6 +1,6 @@ 39bd582c3b06a261cac44d4cab6fd60b download/dbus-1.2.12.tar.gz -c42e10133d9c6358f3fb2a8c14d71cd3 download/CSWdbus.gspec +3b3e5d4ea2722ae6258c8ee0f7688c95 download/CSWdbus.gspec 6e26e51243c4551ac222112edf67b5db download/CSWdbus.preinstall +1d5dad88ae16c76d47398f8e9c2e09a0 download/CSWlibdbusdev.gspec +00bb177908f6107ef2f6caa082475f34 download/CSWlibdbus.gspec 92b99c85d75cac9a2d5f4d3fc43a278d download/cswdbus -efa131461a5aad4ad4516ff9d733e6bf download/CSWlibdbusdev.gspec -31b0245986c698250974b7d038c65beb download/CSWlibdbus.gspec Modified: csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec 2009-03-09 21:15:51 UTC (rev 3682) +++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec 2009-03-09 22:12:03 UTC (rev 3683) @@ -1,4 +1,6 @@ %var bitname dbus %var pkgname CSWdbus %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/license for license information Modified: csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec 2009-03-09 21:15:51 UTC (rev 3682) +++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec 2009-03-09 22:12:03 UTC (rev 3683) @@ -1,4 +1,6 @@ %var bitname libdbus %var pkgname CSWlibdbus %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/lib%{GARNAME}/license for license information Modified: csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec 2009-03-09 21:15:51 UTC (rev 3682) +++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec 2009-03-09 22:12:03 UTC (rev 3683) @@ -1,4 +1,6 @@ %var bitname libdbusdev %var pkgname CSWlibdbusdev %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/lib%{GARNAME}dev/license for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Mar 9 23:17:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 09 Mar 2009 22:17:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3684] csw/mgar/pkg/dbus/trunk/Makefile Message-ID: Revision: 3684 http://gar.svn.sourceforge.net/gar/?rev=3684&view=rev Author: wbonnet Date: 2009-03-09 22:17:38 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Remove extra license files Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2009-03-09 22:12:03 UTC (rev 3683) +++ csw/mgar/pkg/dbus/trunk/Makefile 2009-03-09 22:17:38 UTC (rev 3684) @@ -58,11 +58,6 @@ cp -fr $(FILEDIR)/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/opt/csw/init.d ; \ ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/ ; \ ln -s ../init.d/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus ; ) - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/dbus - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/libdbus - @cp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$GARNAME)-$(GARVERSION)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/dbus/License.txt - @cp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$GARNAME)-$(GARVERSION)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/libdbus/License.txt - @cp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$GARNAME)-$(GARVERSION)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/share/doc/libdbus/License-devel.txt @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Mar 10 04:37:31 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 10 Mar 2009 03:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3685] csw/mgar/pkg/libnet/trunk Message-ID: Revision: 3685 http://gar.svn.sourceforge.net/gar/?rev=3685&view=rev Author: hson Date: 2009-03-10 03:37:31 +0000 (Tue, 10 Mar 2009) Log Message: ----------- libnet: Added patches, old libraries, man pages and other documentation Modified Paths: -------------- csw/mgar/pkg/libnet/trunk/Makefile csw/mgar/pkg/libnet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libnet/trunk/files/buildpatch csw/mgar/pkg/libnet/trunk/files/libnet-cq-end-loop.patch csw/mgar/pkg/libnet/trunk/files/libnet.pc.in csw/mgar/pkg/libnet/trunk/files/libnet.so.1.0.2.i csw/mgar/pkg/libnet/trunk/files/libnet.so.1.0.2.s csw/mgar/pkg/libnet/trunk/files/libnet_build_ntp.patch csw/mgar/pkg/libnet/trunk/files/libnet_checksum.c.patch csw/mgar/pkg/libnet/trunk/files/libnet_pblock_coalesce_leak.patch csw/mgar/pkg/libnet/trunk/files/ltmain.sh Removed Paths: ------------- csw/mgar/pkg/libnet/trunk/files/mainpatch Modified: csw/mgar/pkg/libnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnet/trunk/Makefile 2009-03-09 22:17:38 UTC (rev 3684) +++ csw/mgar/pkg/libnet/trunk/Makefile 2009-03-10 03:37:31 UTC (rev 3685) @@ -9,8 +9,9 @@ MASTER_SITES = http://www.packetfactory.net/libnet/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibnet,) +LICENSE = doc/COPYING + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www.packetfactory.net/libnet/ @@ -19,8 +20,52 @@ DISTNAME = libnet -PATCHFILES = mainpatch +PATCHFILES = buildpatch +PATCHFILES += libnet_pblock_coalesce_leak.patch +PATCHFILES += libnet-cq-end-loop.patch +PATCHFILES += libnet_build_ntp.patch +PATCHFILES += libnet_checksum.c.patch CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + include gar/category.mk + +post-extract-$(MODULATION): + ( cp $(FILEDIR)/ltmain.sh $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME) ) + ( cp $(FILEDIR)/libnet.pc.in $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME)/src ) + @$(MAKECOOKIE) + +post-install-modulated: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/libnet-config $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/BUGS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CHANGELOG $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CONTRIB $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/COPYING $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/DESIGN_NOTES $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/MIGRATION $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PACKET_BUILDING $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PORTED $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/RAWSOCKET_NON_SEQUITUR $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/TODO $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(mandir)/man3 + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-functions.h.3 $(DESTDIR)$(mandir)/man3 + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-headers.h.3 $(DESTDIR)$(mandir)/man3 + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-macros.h.3 $(DESTDIR)$(mandir)/man3 + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet.h.3 $(DESTDIR)$(mandir)/man3 + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1q_hdr.3 $(DESTDIR)$(mandir)/man3 + @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1x_hdr.3 $(DESTDIR)$(mandir)/man3 + @$(MAKECOOKIE) + +post-install-isa-sparcv8: + @ginstall -d $(DESTDIR)$(libdir) + @cp $(FILEDIR)/libnet.so.1.0.2.s $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 + @$(MAKECOOKIE) + +post-install-isa-i386: + @ginstall -d $(DESTDIR)$(libdir) + @cp $(FILEDIR)/libnet.so.1.0.2.i $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libnet/trunk/checksums =================================================================== --- csw/mgar/pkg/libnet/trunk/checksums 2009-03-09 22:17:38 UTC (rev 3684) +++ csw/mgar/pkg/libnet/trunk/checksums 2009-03-10 03:37:31 UTC (rev 3685) @@ -1,3 +1,6 @@ be845c41170d72c7db524f3411b50256 download/libnet-1.1.2.1.tar.gz -f88f915ffd9e70173036d42db0d3642b download/CSWlibnet.gspec -ca847f8bf19895372cb392215badc008 download/mainpatch +8bd8908d73e8b0e81e372f5ef2cf552a download/buildpatch +c074b4d206f3041a64afcde1a5b2d5d0 download/libnet_pblock_coalesce_leak.patch +ca892b6a33f04cafb6def978c97ecb45 download/libnet-cq-end-loop.patch +b49b610c4726a359bd42c3ad3211f169 download/libnet_build_ntp.patch +fe5dc7c78f5326f271c75595ff50d376 download/libnet_checksum.c.patch Added: csw/mgar/pkg/libnet/trunk/files/buildpatch =================================================================== --- csw/mgar/pkg/libnet/trunk/files/buildpatch (rev 0) +++ csw/mgar/pkg/libnet/trunk/files/buildpatch 2009-03-10 03:37:31 UTC (rev 3685) @@ -0,0 +1,42360 @@ +diff -ru libnet.orig/Makefile.in libnet/Makefile.in +--- libnet.orig/Makefile.in 2004-03-11 19:50:20.000000000 +0100 ++++ libnet/Makefile.in 2009-03-09 16:58:48.160768448 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.6.3 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,7 +14,7 @@ + + @SET_MAKE@ + +-# $Id: Makefile.in,v 1.16 2004/03/11 18:50:20 mike Exp $ ++# $Id: Makefile.am,v 1.7 2004/03/01 20:26:11 mike Exp $ + # + # Libnet automake information file + # Copyright (c) 1998 - 2004 Mike D. Schiffman +@@ -22,139 +22,251 @@ + # + # Process this file with automake to produce a Makefile.in script. + +-# $Id: Makefile.in,v 1.16 2004/03/11 18:50:20 mike Exp $ ++# $Id: Makefile.am.common,v 1.3 2004/01/03 20:31:00 mike Exp $ + # + # Libnet automake information file + # Copyright (c) 1998 - 2004 Mike D. Schiffman + # All rights reserved. + # +-SHELL = @SHELL@ +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +- +-bindir = @bindir@ +-sbindir = @sbindir@ +-libexecdir = @libexecdir@ +-datadir = @datadir@ +-sysconfdir = @sysconfdir@ +-sharedstatedir = @sharedstatedir@ +-localstatedir = @localstatedir@ +-libdir = @libdir@ +-infodir = @infodir@ +-mandir = @mandir@ +-includedir = @includedir@ +-oldincludedir = /usr/include + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . +- +-ACLOCAL = @ACLOCAL@ +-AUTOCONF = @AUTOCONF@ +-AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_DATA = @INSTALL_DATA@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) +-transform = @program_transform_name@ ++transform = $(program_transform_name) + NORMAL_INSTALL = : + PRE_INSTALL = : + POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_alias = @build_alias@ + build_triplet = @build@ +-host_alias = @host_alias@ + host_triplet = @host@ +-target_alias = @target_alias@ + target_triplet = @target@ +- +-EXEEXT = @EXEEXT@ +-OBJEXT = @OBJEXT@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ ++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/libnet-config.in \ ++ $(srcdir)/version.h.in $(top_srcdir)/Makefile.am.common \ ++ $(top_srcdir)/configure acconfig.h config.guess config.sub \ ++ install-sh ltmain.sh missing mkinstalldirs ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno config.status.lineno ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/include/config.h ++CONFIG_CLEAN_FILES = version.h libnet-config ++depcomp = ++am__depfiles_maybe = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++DIST_ARCHIVES = $(distdir).tar.gz ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ACLOCAL = @ACLOCAL@ + ADDITIONAL_LIBS = @ADDITIONAL_LIBS@ + AMTAR = @AMTAR@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ + ENDIANESS = @ENDIANESS@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++GREP = @GREP@ + HAVE_PACKET_SOCKET = @HAVE_PACKET_SOCKET@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ ++LIBNET_AGE = @LIBNET_AGE@ + LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@ + LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@ + LIBNET_CONFIG_LIBS = @LIBNET_CONFIG_LIBS@ ++LIBNET_CURRENT = @LIBNET_CURRENT@ ++LIBNET_REVISION = @LIBNET_REVISION@ + LIBNET_VERSION = @LIBNET_VERSION@ ++LIBNET_VERSION_INFO = @LIBNET_VERSION_INFO@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ + am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ + install_sh = @install_sh@ +- ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target = @target@ ++target_alias = @target_alias@ ++target_cpu = @target_cpu@ ++target_os = @target_os@ ++target_vendor = @target_vendor@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies +- + DISTCLEANFILES = *~ +- + SUBDIRS = include src sample +- + EXTRA_DIST = Makefile.am.common +- + bin_scripts = libnet-config +-subdir = . +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/include/config.h +-CONFIG_CLEAN_FILES = version.h libnet-config +-depcomp = +-am__depfiles_maybe = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ +- uninstall-info-recursive all-recursive install-data-recursive \ +- install-exec-recursive installdirs-recursive install-recursive \ +- uninstall-recursive check-recursive installcheck-recursive +-DIST_COMMON = README Makefile.am Makefile.in acconfig.h acinclude.m4 \ +- aclocal.m4 config.guess config.sub configure configure.in \ +- install-sh libnet-config.in missing mkinstalldirs version.h.in +-DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +- +-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4) ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ ++ cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; + +-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +- cd $(srcdir) && $(AUTOCONF) + +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +-version.h: $(top_builddir)/config.status version.h.in ++version.h: $(top_builddir)/config.status $(srcdir)/version.h.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-libnet-config: $(top_builddir)/config.status libnet-config.in ++libnet-config: $(top_builddir)/config.status $(srcdir)/libnet-config.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-uninstall-info-am: ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool config.lt + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -163,7 +275,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -175,15 +293,20 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -204,44 +327,67 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +- +-ETAGS = etags +-ETAGSFLAGS = +- +-tags: TAGS ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + + GTAGS: +@@ -250,34 +396,26 @@ + && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = . +-distdir = $(PACKAGE)-$(VERSION) +- +-am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } +- +-GZIP_ENV = --best +-distcleancheck_listfiles = find . -type f -print ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkinstalldirs) $(distdir)/. $(distdir)/include +- @list='$(DISTFILES)'; for file in $$list; do \ ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -288,15 +426,19 @@ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -304,29 +446,63 @@ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir +- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist-bzip2: distdir ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + + dist dist-all: distdir +- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. + distcheck: dist +- $(am__remove_distdir) +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ *.tar.bz2*) \ ++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac + chmod -R a-w $(distdir); chmod a+w $(distdir) +- mkdir $(distdir)/=build +- mkdir $(distdir)/=inst ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst + chmod a-w $(distdir) +- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ +- && cd $(distdir)/=build \ +- && ../configure --srcdir=.. --prefix=$$dc_install_base \ ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && cd $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ +@@ -334,23 +510,40 @@ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ +- && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ +- || { echo "ERROR: files left after uninstall:" ; \ +- find $$dc_install_base -type f -print ; \ +- exit 1; } >&2 ) \ +- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ +- && rm -f $(distdir).tar.gz \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) +- @echo "$(distdir).tar.gz is ready for distribution" | \ +- sed 'h;s/./=/g;p;x;p;x' ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++distuninstallcheck: ++ @cd $(distuninstallcheck_dir) \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 + distcleancheck: distclean +- if test '$(srcdir)' = . ; then \ ++ @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi +- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ +- || { echo "ERROR: files left after distclean:" ; \ ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 + check-am: all-am +@@ -358,7 +551,6 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -370,7 +562,7 @@ + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- INSTALL_STRIP_FLAG=-s \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: +@@ -378,7 +570,7 @@ + clean-generic: + + distclean-generic: +- -rm -f Makefile $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -386,57 +578,80 @@ + @echo "it deletes files that may require special tools to rebuild." + clean: clean-recursive + +-clean-am: clean-generic mostlyclean-am ++clean-am: clean-generic clean-libtool mostlyclean-am + + distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) +-distclean-am: clean-am distclean-generic distclean-tags ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-libtool \ ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) +- -rm -rf autom4te.cache ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + + mostlyclean: mostlyclean-recursive + +-mostlyclean-am: mostlyclean-generic ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-recursive + +-uninstall-am: uninstall-info-am ++pdf-am: + +-uninstall-info: uninstall-info-recursive ++ps: ps-recursive + +-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ +- clean-generic clean-recursive dist dist-all dist-gzip distcheck \ +- distclean distclean-generic distclean-recursive distclean-tags \ +- distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ +- info-recursive install install-am install-data install-data-am \ +- install-data-recursive install-exec install-exec-am \ +- install-exec-recursive install-info install-info-am \ +- install-info-recursive install-man install-recursive \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am installdirs-recursive maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ +- mostlyclean-generic mostlyclean-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++ps-am: ++ ++uninstall-am: ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ ++ distclean distclean-generic distclean-libtool distclean-tags \ ++ distcleancheck distdir distuninstallcheck dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -ru libnet.orig/acinclude.m4 libnet/acinclude.m4 +--- libnet.orig/acinclude.m4 2004-01-16 00:53:06.000000000 +0100 ++++ libnet/acinclude.m4 2009-03-10 00:34:01.428768705 +0100 +@@ -11,7 +11,7 @@ + dnl usage: AC_LIBNET_LINUX_PROCFS + dnl results: HAVE_LINUX_PROCFS + dnl +-AC_DEFUN(AC_LIBNET_LINUX_PROCFS, ++AC_DEFUN([AC_LIBNET_LINUX_PROCFS], + [AC_MSG_CHECKING(for Linux proc filesystem) + AC_CACHE_VAL(ac_cv_libnet_linux_procfs, + if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then +@@ -37,15 +37,15 @@ + dnl HAVE_PACKET_SOCKET (DEFINED) + dnl + +-AC_DEFUN(AC_LIBNET_CHECK_PF_PACKET, ++AC_DEFUN([AC_LIBNET_CHECK_PF_PACKET], + [ + AC_MSG_CHECKING(for packet socket (PF_SOCKET)) +- AC_CACHE_VAL(ac_libnet_have_packet_socket, ++ AC_CACHE_VAL(ac_cv_libnet_have_packet_socket, + + [case "$target_os" in + + linux) +- ac_libnet_have_packet_socket = no ++ ac_cv_libnet_have_packet_socket = no + ;; + *) + +@@ -94,17 +94,17 @@ + + # Oopz 4.3 BSD doesn't have this. Sorry. + if test ! -x ./pf_packet-test ; then +- ac_libnet_have_packet_socket=choked ++ ac_cv_libnet_have_packet_socket=choked + else +- ac_libnet_have_packet_socket=`./pf_packet-test`; ++ ac_cv_libnet_have_packet_socket=`./pf_packet-test`; + fi +- if test $ac_libnet_have_packet_socket = choked; then ++ if test $ac_cv_libnet_have_packet_socket = choked; then + AC_MSG_RESULT(test program compile choked... assuming no) +- elif test $ac_libnet_have_packet_socket = yes; then ++ elif test $ac_cv_libnet_have_packet_socket = yes; then + AC_MSG_RESULT(yes) +- elif test $ac_libnet_have_packet_socket = probably; then ++ elif test $ac_cv_libnet_have_packet_socket = probably; then + AC_MSG_RESULT(test program got EPERM... assuming yes) +- elif test $ac_libnet_have_packet_socket = no; then ++ elif test $ac_cv_libnet_have_packet_socket = no; then + AC_MSG_RESULT(no) + fi + +@@ -112,7 +112,7 @@ + ;; + esac]) + +- if test $ac_libnet_have_packet_socket = yes -o $ac_libnet_have_packet_socket = probably; then ++ if test $ac_cv_libnet_have_packet_socket = yes -o $ac_cv_libnet_have_packet_socket = probably; then + AC_DEFINE(HAVE_PACKET_SOCKET) + fi + ]) +@@ -131,17 +131,17 @@ + dnl + dnl + +-AC_DEFUN(AC_LIBNET_CHECK_LIBNET_VER, ++AC_DEFUN([AC_LIBNET_CHECK_LIBNET_VER], + [ + AC_CHECK_LIB(net, libnet_build_ip, AC_MSG_CHECKING(version) \ + + changequote(<<, >>)dnl +- if [[ ! -f $LIB_PREFIX/libnet.a ]] ; then ++ if [[ ! -f $LIB_PREFIX/libnet.la ]] ; then + changequote([, ])dnl +- AC_MSG_RESULT($LIB_PREFIX/libnet.a doesn't exist) ++ AC_MSG_RESULT($LIB_PREFIX/libnet.la doesn't exist) + AC_MSG_RESULT(previous libnet install lives elsewhere, you should probably find it) + else +- __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.a | grep "libnet version"\ ++ __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.la | grep "libnet version"\ + | cut -f3 -d" "`;\ + if test -z "$__LIBNET_VERSION"; then + AC_MSG_RESULT(<0.8) +@@ -166,7 +166,7 @@ + dnl HAVE_STRUCT_IP_CSUM (DEFINED) + dnl + +-AC_DEFUN(AC_LIBNET_CHECK_IP_CSUM, ++AC_DEFUN([AC_LIBNET_CHECK_IP_CSUM], + [ + AC_MSG_CHECKING([struct ip contains ip_csum]) + AC_TRY_COMPILE([ +@@ -199,7 +199,7 @@ + dnl LBL_ALIGN (DEFINED) + dnl + +-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, ++AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + [AC_MSG_CHECKING(if unaligned accesses fail) + AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, + [case "$target_cpu" in +@@ -278,7 +278,7 @@ + dnl LIBNET_LIL_ENDIAN = 1 + dnl + +-AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, ++AC_DEFUN([AC_LIBNET_ENDIAN_CHECK], + [AC_MSG_CHECKING(machine endianess) + + cat > conftest.c << EOF +@@ -439,7 +439,7 @@ + dnl statically and happen to have a libresolv.a lying around (and no + dnl libnsl.a). + dnl +-AC_DEFUN(AC_LBL_LIBRARY_NET, [ ++AC_DEFUN([AC_LBL_LIBRARY_NET], [ + # Most operating systems have gethostbyname() in the default searched + # libraries (i.e. libc): + AC_CHECK_FUNC(gethostbyname, , +diff -ru libnet.orig/aclocal.m4 libnet/aclocal.m4 +--- libnet.orig/aclocal.m4 2004-03-01 21:26:11.000000000 +0100 ++++ libnet/aclocal.m4 2009-03-09 16:58:13.599561854 +0100 +@@ -1,7 +1,7 @@ +-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.2 -*- Autoconf -*- + +-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,771 +11,6622 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-dnl $Id: aclocal.m4,v 1.9 2004/03/01 20:26:11 mike Exp $ +-dnl +-dnl Libnet specific autoconf macros +-dnl Copyright (c) 1998 - 2004 Mike D. Schiffman +-dnl All rights reserved. +-dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, ++[m4_warning([this file was generated for autoconf 2.63. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) ++ ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++ ++# serial 51 AC_PROG_LIBTOOL ++ ++ ++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++# ----------------------------------------------------------- ++# If this macro is not defined by Autoconf, define it here. ++m4_ifdef([AC_PROVIDE_IFELSE], ++ [], ++ [m4_define([AC_PROVIDE_IFELSE], ++ [m4_ifdef([AC_PROVIDE_$1], ++ [$2], [$3])])]) + +-dnl +-dnl Check for the Linux /proc filesystem +-dnl +-dnl usage: AC_LIBNET_LINUX_PROCFS +-dnl results: HAVE_LINUX_PROCFS +-dnl +-AC_DEFUN(AC_LIBNET_LINUX_PROCFS, +- [AC_MSG_CHECKING(for Linux proc filesystem) +- AC_CACHE_VAL(ac_cv_libnet_linux_procfs, +- if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then +- ac_cv_libnet_linux_procfs=yes +- else +- ac_cv_libnet_linux_procfs=no +- fi) +- AC_MSG_RESULT($ac_cv_libnet_linux_procfs) +- if test $ac_cv_libnet_linux_procfs = yes ; then +- AC_DEFINE(HAVE_LINUX_PROCFS, 1, +- [Define if you have the Linux /proc filesystem.]) +- fi]) + +-dnl +-dnl Checks to see if this linux kernel has a working PF_PACKET +-dnl +-dnl usage: +-dnl +-dnl AC_LIBNET_CHECK_PF_PACKET +-dnl +-dnl results: +-dnl +-dnl HAVE_PACKET_SOCKET (DEFINED) +-dnl ++# AC_PROG_LIBTOOL ++# --------------- ++AC_DEFUN([AC_PROG_LIBTOOL], ++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++ AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [AC_LIBTOOL_CXX], ++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++ ])]) ++dnl And a similar setup for Fortran 77 support ++ AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [AC_LIBTOOL_F77], ++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++])]) ++ ++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++ AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [ifdef([AC_PROG_GCJ], ++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([A][M_PROG_GCJ], ++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([LT_AC_PROG_GCJ], ++ [define([LT_AC_PROG_GCJ], ++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++])])# AC_PROG_LIBTOOL ++ ++ ++# _AC_PROG_LIBTOOL ++# ---------------- ++AC_DEFUN([_AC_PROG_LIBTOOL], ++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL ++ ++ ++# AC_LIBTOOL_SETUP ++# ---------------- ++AC_DEFUN([AC_LIBTOOL_SETUP], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AC_ENABLE_SHARED])dnl ++AC_REQUIRE([AC_ENABLE_STATIC])dnl ++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_LD])dnl ++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++AC_REQUIRE([AC_PROG_NM])dnl ++ ++AC_REQUIRE([AC_PROG_LN_S])dnl ++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++AC_REQUIRE([AC_OBJEXT])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++dnl ++ ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR ++ ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac + +-AC_DEFUN(AC_LIBNET_CHECK_PF_PACKET, +-[ +- AC_MSG_CHECKING(for packet socket (PF_SOCKET)) +- AC_CACHE_VAL(ac_libnet_have_packet_socket, ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++ ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Constants: ++rm="rm -f" ++ ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi + +- [case "$target_os" in ++_LT_CC_BASENAME([$compiler]) + +- linux) +- ac_libnet_have_packet_socket = no +- ;; +- *) ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ AC_PATH_MAGIC ++ fi ++ ;; ++esac + +- cat > pf_packet-test.c << EOF +-#include +-#include +-#include +-#include +-#include +-#include /* for the glibc version number */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 +-#include +-#include /* the L2 protocols */ +-#else +-#include +-#include +-#include /* The L2 protocols */ +-#endif +- +-#ifndef SOL_PACKET +-#define SOL_PACKET 263 +-#endif /* SOL_PACKET */ +- +-int +-main(int argc, char **argv) +-{ +- int fd; +- +- fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); +- if (fd == -1) +- { +- if (errno == EPERM) +- { +- /* user's UID != 0 */ +- printf("probably"); +- exit (EXIT_FAILURE); +- } +- printf("no"); +- exit (EXIT_FAILURE); +- } +- printf("yes"); +- exit (EXIT_SUCCESS); +-} +-EOF +- ${CC-cc} -o pf_packet-test $CFLAGS pf_packet-test.c >/dev/null 2>&1 ++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++enable_win32_dll=yes, enable_win32_dll=no) ++ ++AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++AC_ARG_WITH([pic], ++ [AC_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++test -z "$pic_mode" && pic_mode=default ++ ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP ++ ++ ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) + +- # Oopz 4.3 BSD doesn't have this. Sorry. +- if test ! -x ./pf_packet-test ; then +- ac_libnet_have_packet_socket=choked +- else +- ac_libnet_have_packet_socket=`./pf_packet-test`; +- fi +- if test $ac_libnet_have_packet_socket = choked; then +- AC_MSG_RESULT(test program compile choked... assuming no) +- elif test $ac_libnet_have_packet_socket = yes; then +- AC_MSG_RESULT(yes) +- elif test $ac_libnet_have_packet_socket = probably; then +- AC_MSG_RESULT(test program got EPERM... assuming yes) +- elif test $ac_libnet_have_packet_socket = no; then +- AC_MSG_RESULT(no) +- fi + +- rm -f pf_packet-test* core core.pf_packet-test +- ;; +- esac]) ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE + +- if test $ac_libnet_have_packet_socket = yes -o $ac_libnet_have_packet_socket = probably; then +- AC_DEFINE(HAVE_PACKET_SOCKET) +- fi +-]) + +-dnl +-dnl Looks for a previous libnet version and attempts to determine which verion +-dnl it is. Version 0.8 was the first version that actually knew internally +-dnl what version it was. +-dnl +-dnl usage: +-dnl +-dnl AC_LIBNET_CHECK_LIBNET_VERSION +-dnl +-dnl results: +-dnl +-dnl +-dnl ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE + +-AC_DEFUN(AC_LIBNET_CHECK_LIBNET_VER, +-[ +- AC_CHECK_LIB(net, libnet_build_ip, AC_MSG_CHECKING(version) \ + +-changequote(<<, >>)dnl +- if [[ ! -f $LIB_PREFIX/libnet.a ]] ; then +-changequote([, ])dnl +- AC_MSG_RESULT($LIB_PREFIX/libnet.a doesn't exist) +- AC_MSG_RESULT(previous libnet install lives elsewhere, you should probably find it) +- else +- __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.a | grep "libnet version"\ +- | cut -f3 -d" "`;\ +- if test -z "$__LIBNET_VERSION"; then +- AC_MSG_RESULT(<0.8) +- else +- AC_MSG_RESULT($__LIBNET_VERSION) +- fi +- fi\ +- ) +-]) ++# _LT_AC_SYS_LIBPATH_AIX ++# ---------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_AC_SYS_LIBPATH_AIX + + +-dnl +-dnl Checks to see if this linux kernel uses ip_sum or ip_csum +-dnl (Pulled from queso) +-dnl +-dnl usage: +-dnl +-dnl AC_LIBNET_CHECK_IP_CSUM +-dnl +-dnl results: +-dnl +-dnl HAVE_STRUCT_IP_CSUM (DEFINED) +-dnl ++# _LT_AC_SHELL_INIT(ARG) ++# ---------------------- ++AC_DEFUN([_LT_AC_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_AC_SHELL_INIT ++ ++ ++# _LT_AC_PROG_ECHO_BACKSLASH ++# -------------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++[_LT_AC_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac ++ ++echo=${ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi + +-AC_DEFUN(AC_LIBNET_CHECK_IP_CSUM, +-[ +- AC_MSG_CHECKING([struct ip contains ip_csum]) +- AC_TRY_COMPILE([ +- #define __BSD_SOURCE +- #define _BSD_SOURCE +- #include +- #include +- #include +- #include ], +- [ +- struct ip ip; +- ip.ip_csum = 0; +- ], +- [AC_MSG_RESULT(yes); +- AC_DEFINE(HAVE_STRUCT_IP_CSUM)], +- [AC_MSG_RESULT(no); +- ]) +-]) ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH ++ ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break ++ fi ++ done ++fi + +-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, +- [AC_MSG_CHECKING(if unaligned accesses fail) +- AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, +- [case "$target_cpu" in +- +- alpha|hp*|mips|sparc) +- ac_cv_lbl_unaligned_fail=yes +- ;; +- +- *) +- cat >conftest.c < +-# include +-# include +- unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() +- { +- unsigned int i; +- pid_t pid; +- int status; +- /* avoid "core dumped" message */ +- pid = fork(); +- if (pid < 0) +- { +- exit(2); +- } +- if (pid > 0) +- { +- /* parent */ +- pid = waitpid(pid, &status, 0); +- if (pid < 0) +- { +- exit(3); +- } +- exit(!WIFEXITED(status)); +- } +- /* child */ +- i = *(unsigned int *)&a[[1]]; +- printf("%d\n", i); +- exit(0); +- } +-EOF +- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ +- conftest.c $LIBS > /dev/null 2>&1 +- # Oopz 4.3 BSD doesn't have this. Sorry. +- if test ! -x conftest ; then +- dnl failed to compile for some reason +- ac_cv_lbl_unaligned_fail=yes +- else +- ./conftest > conftest.out +- if test ! -s conftest.out ; then +- ac_cv_lbl_unaligned_fail=yes +- else +- ac_cv_lbl_unaligned_fail=no +- fi +- fi +- rm -f conftest* core core.conftest +- ;; +- esac]) +- AC_MSG_RESULT($ac_cv_lbl_unaligned_fail) +- if test $ac_cv_lbl_unaligned_fail = yes ; then +- AC_DEFINE(LBL_ALIGN) ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break + fi +-]) ++ done ++ IFS="$lt_save_ifs" + ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + +-dnl +-dnl Checks endianess +-dnl +-dnl usage: +-dnl +-dnl AC_LIBNET_ENDIAN_CHECK +-dnl +-dnl results: +-dnl +-dnl LIBNET_BIG_ENDIAN = 1 or +-dnl LIBNET_LIL_ENDIAN = 1 +-dnl ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo ++ fi ++ fi ++ fi ++ fi ++fi ++fi + +-AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, +- [AC_MSG_CHECKING(machine endianess) ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi + +- cat > conftest.c << EOF +-# include +-# include +- +- int main() +- { +- union +- { +- short s; +- char c[[sizeof(short)]]; +- } un; +- +- un.s = 0x0102; +- if (sizeof (short) == 2) +- { +- if (un.c [[0]] == 1 && un.c [[1]] == 2) +- { +- printf("B\n"); +- } +- else +- { +- if (un.c [[0]] == 2 && un.c [[1]] == 1) +- { +- printf("L\n"); +- } +- } +- } +- else +- { +- printf("?\n"); +- } +- return (EXIT_SUCCESS); +- } +-EOF +- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS > /dev/null 2>&1 +- # Oopz 4.3 BSD doesn't have this. Sorry. +- if test ! -x conftest ; then +-dnl failed to compile for some reason +- ac_cv_libnet_endianess=unknown +- else +- ./conftest > conftest.out +- result=`cat conftest.out` +- if test $result = "B"; then +- ac_cv_libnet_endianess=big +- elif test $result = "L"; then +- ac_cv_libnet_endianess=lil +- else +- ac_cv_libnet_endianess=unknown +- fi +- fi +- rm -f conftest* core core.conftest ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH + +- AC_MSG_RESULT($ac_cv_libnet_endianess) + +- if test $ac_cv_libnet_endianess = big ; then +- AC_DEFINE(LIBNET_BIG_ENDIAN) +- ENDIANESS="LIBNET_BIG_ENDIAN" +- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN" +- elif test $ac_cv_libnet_endianess = lil ; then +- AC_DEFINE(LIBNET_LIL_ENDIAN) +- ENDIANESS="LIBNET_LIL_ENDIAN" +- LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN" +- fi +- ]) ++# _LT_AC_LOCK ++# ----------- ++AC_DEFUN([_LT_AC_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; + +-dnl +-dnl Improved version of AC_CHECK_LIB +-dnl +-dnl Thanks to John Hawkinson (jhawk at mit.edu) +-dnl +-dnl usage: +-dnl +-dnl AC_LBL_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, +-dnl ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) +-dnl +-dnl results: +-dnl +-dnl LIBS +-dnl +- +-define(AC_LBL_CHECK_LIB, +-[AC_MSG_CHECKING([for $2 in -l$1]) +-dnl Use a cache variable name containing both the library and function name, +-dnl because the test really is for library $1 defining function $2, not +-dnl just for library $1. Separate tests with the same $1 and different $2's +-dnl may have different results. +-ac_lib_var=`echo $1['_']$2['_']$5 | sed 'y%./+- %__p__%'` +-AC_CACHE_VAL(ac_cv_lbl_lib_$ac_lib_var, +-[ac_save_LIBS="$LIBS" +-LIBS="-l$1 $5 $LIBS" +-AC_TRY_LINK(dnl +-ifelse([$2], [main], , dnl Avoid conflicting decl of main. +-[/* Override any gcc2 internal prototype to avoid an error. */ +-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +-extern "C" +-#endif +-])dnl +-[/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $2(); +-]), +- [$2()], +- eval "ac_cv_lbl_lib_$ac_lib_var=yes", +- eval "ac_cv_lbl_lib_$ac_lib_var=no") +-LIBS="$ac_save_LIBS" +-])dnl +-if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then +- AC_MSG_RESULT(yes) +- ifelse([$3], , +-[changequote(, )dnl +- ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +-changequote([, ])dnl +- AC_DEFINE_UNQUOTED($ac_tr_lib) +- LIBS="-l$1 $LIBS" +-], [$3]) +-else +- AC_MSG_RESULT(no) +-ifelse([$4], , , [$4 +-])dnl +-fi +-]) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +-dnl +-dnl AC_LBL_LIBRARY_NET +-dnl +-dnl This test is for network applications that need socket() and +-dnl gethostbyname() -ish functions. Under Solaris, those applications +-dnl need to link with "-lsocket -lnsl". Under IRIX, they need to link +-dnl with "-lnsl" but should *not* link with "-lsocket" because +-dnl libsocket.a breaks a number of things (for instance: +-dnl gethostbyname() under IRIX 5.2, and snoop sockets under most +-dnl versions of IRIX). +-dnl +-dnl Unfortunately, many application developers are not aware of this, +-dnl and mistakenly write tests that cause -lsocket to be used under +-dnl IRIX. It is also easy to write tests that cause -lnsl to be used +-dnl under operating systems where neither are necessary (or useful), +-dnl such as SunOS 4.1.4, which uses -lnsl for TLI. +-dnl +-dnl This test exists so that every application developer does not test +-dnl this in a different, and subtly broken fashion. +- +-dnl It has been argued that this test should be broken up into two +-dnl seperate tests, one for the resolver libraries, and one for the +-dnl libraries necessary for using Sockets API. Unfortunately, the two +-dnl are carefully intertwined and allowing the autoconf user to use +-dnl them independantly potentially results in unfortunate ordering +-dnl dependancies -- as such, such component macros would have to +-dnl carefully use indirection and be aware if the other components were +-dnl executed. Since other autoconf macros do not go to this trouble, +-dnl and almost no applications use sockets without the resolver, this +-dnl complexity has not been implemented. +-dnl +-dnl The check for libresolv is in case you are attempting to link +-dnl statically and happen to have a libresolv.a lying around (and no +-dnl libnsl.a). +-dnl +-AC_DEFUN(AC_LBL_LIBRARY_NET, [ +- # Most operating systems have gethostbyname() in the default searched +- # libraries (i.e. libc): +- AC_CHECK_FUNC(gethostbyname, , +- # Some OSes (eg. Solaris) place it in libnsl: +- AC_LBL_CHECK_LIB(nsl, gethostbyname, , +- # Some strange OSes (SINIX) have it in libsocket: +- AC_LBL_CHECK_LIB(socket, gethostbyname, , +- # Unfortunately libsocket sometimes depends on libnsl. +- # AC_CHECK_LIB's API is essentially broken so the +- # following ugliness is necessary: +- AC_LBL_CHECK_LIB(socket, gethostbyname, +- LIBS="-lsocket -lnsl $LIBS", +- AC_CHECK_LIB(resolv, gethostbyname), +- -lnsl)))) +- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, , +- AC_LBL_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , +- -lnsl))) +- # DLPI needs putmsg under HPUX so test for -lstr while we're at it +- AC_CHECK_LIB(str, putmsg) +- ]) ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++ ]) ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++])# _LT_AC_LOCK ++ ++ ++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++]) + +-# Do all the work for Automake. -*- Autoconf -*- ++if test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION + +-# This macro actually does too much some checks are only needed if +-# your package does certain things. But this isn't really a big deal. + +-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ------------------------------------------------------------ ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) + +-# 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 2, or (at your option) +-# any later version. ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION + +-# 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, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# -------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++[# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; + +-# serial 8 ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-AC_PREREQ([2.52]) ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; + +-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +-# the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +- AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) + fi ++])# AC_LIBTOOL_SYS_MAX_CMD_LEN + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl +- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_MISSING_PROG(AMTAR, tar) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl + +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_][CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_][CC], +- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_][CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_][CXX], +- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-]) +-]) ++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# --------------------------------------------------------------------- ++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext < ++#endif + +-# 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 2, or (at your option) +-# any later version. ++#include + +-# 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. ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.6.3])]) ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; + +-# Helper functions for option handling. -*- Autoconf -*- ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); + +-# Copyright 2001, 2002 Free Software Foundation, Inc. ++ exit (status); ++}] ++EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_AC_TRY_DLOPEN_SELF + +-# 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 2, 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. ++# AC_LIBTOOL_DLOPEN_SELF ++# ---------------------- ++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; ++ ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++])# AC_LIBTOOL_DLOPEN_SELF ++ ++ ++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++# --------------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler ++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++]) ++])# AC_LIBTOOL_PROG_CC_C_O ++ ++ ++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++# ----------------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++[AC_REQUIRE([_LT_AC_LOCK])dnl ++ ++hard_links="nottested" ++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++ ++ ++# AC_LIBTOOL_OBJDIR ++# ----------------- ++AC_DEFUN([AC_LIBTOOL_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++])# AC_LIBTOOL_OBJDIR ++ ++ ++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++# ---------------------------------------------- ++# Check hardcoding attributes. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_AC_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++ ++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++ ++ ++# AC_LIBTOOL_SYS_LIB_STRIP ++# ------------------------ ++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++[striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++])# AC_LIBTOOL_SYS_LIB_STRIP ++ ++ ++# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++m4_if($1,[],[ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix4* | aix5*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Mar 10 10:14:58 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 10 Mar 2009 09:14:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3686] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 3686 http://gar.svn.sourceforge.net/gar/?rev=3686&view=rev Author: idogan23 Date: 2009-03-10 09:14:58 +0000 (Tue, 10 Mar 2009) Log Message: ----------- unbound: fixed dependencies Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-03-10 03:37:31 UTC (rev 3685) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-03-10 09:14:58 UTC (rev 3686) @@ -11,7 +11,7 @@ MASTER_SITES = http://unbound.net/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWunbound, depend) +DISTFILES += $(call admfiles,CSWunbound) DISTFILES += cswunbound DISTFILES += cswusergroup @@ -22,7 +22,7 @@ PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/unbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' # We define upstream file regex so we can be notifed of new upstream software release -#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES @@ -34,6 +34,8 @@ CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +REQUIRED_PKGS = CSWosslrt CSWgcc4corert + post-install-modulated: @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound Deleted: csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend =================================================================== --- csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend 2009-03-10 03:37:31 UTC (rev 3685) +++ csw/mgar/pkg/unbound/trunk/files/CSWunbound.depend 2009-03-10 09:14:58 UTC (rev 3686) @@ -1,3 +0,0 @@ -P CSWcommon -P CSWosslrt -P CSWgcc4corert This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 11:12:09 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 10:12:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3687] csw/mgar/pkg/cpan Message-ID: Revision: 3687 http://gar.svn.sourceforge.net/gar/?rev=3687&view=rev Author: bonivart Date: 2009-03-10 10:12:06 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Number-Format: move to GAR, update to 1.70 Added Paths: ----------- csw/mgar/pkg/cpan/Number-Format/ csw/mgar/pkg/cpan/Number-Format/branches/ csw/mgar/pkg/cpan/Number-Format/tags/ csw/mgar/pkg/cpan/Number-Format/trunk/ csw/mgar/pkg/cpan/Number-Format/trunk/Makefile csw/mgar/pkg/cpan/Number-Format/trunk/checksums csw/mgar/pkg/cpan/Number-Format/trunk/files/ csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec Property changes on: csw/mgar/pkg/cpan/Number-Format/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Number-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Number-Format/trunk/Makefile 2009-03-10 10:12:06 UTC (rev 3687) @@ -0,0 +1,27 @@ +GARNAME = Number-Format +GARVERSION = 1.70 +CATEGORIES = cpan +AUTHOR = WRW + +DESCRIPTION = Perl extension for formatting numbers +define BLURB + Number::Format is a library for formatting numbers. Functions are provided for + converting numbers to strings in a variety of ways, and to convert strings that + contain numbers back into numeric form. The output formats may include thousands + separators - characters inserted between each group of three characters counting + right to left from the decimal point. The characters used for the decimal point and + the thousands separator come from the locale information or can be specified by the + user. +endef + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpmnumberformat,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +#CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +include gar/category.mk Added: csw/mgar/pkg/cpan/Number-Format/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Number-Format/trunk/checksums 2009-03-10 10:12:06 UTC (rev 3687) @@ -0,0 +1,3 @@ +72fd7eb99086208404b743f53e3e2e12 download/Number-Format-1.70.tar.gz +97cffeda96d92672f2f16da1d999438c download/CSWpmnumberformat.gspec +72fd7eb99086208404b743f53e3e2e12 download/Number-Format-1.70.tar.gz Added: csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec (rev 0) +++ csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec 2009-03-10 10:12:06 UTC (rev 3687) @@ -0,0 +1,10 @@ +%var bitname pm_numberformat +%var pkgname CSWpmnumberformat +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright + +This package is copyright 1997-2008 by William R. Ward et al., and may +be distributed under the same terms as cover Perl itself (your choice +of Artistic or GPL). See http://dev.perl.org/licenses/ for more +information. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 13:09:17 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 12:09:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[3688] csw/mgar/pkg/cpan Message-ID: Revision: 3688 http://gar.svn.sourceforge.net/gar/?rev=3688&view=rev Author: bonivart Date: 2009-03-10 12:09:17 +0000 (Tue, 10 Mar 2009) Log Message: ----------- OLE-Storage_Lite: move to GAR, update to 0.18 Added Paths: ----------- csw/mgar/pkg/cpan/OLE-Storage_Lite/ csw/mgar/pkg/cpan/OLE-Storage_Lite/branches/ csw/mgar/pkg/cpan/OLE-Storage_Lite/tags/ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec Property changes on: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile 2009-03-10 12:09:17 UTC (rev 3688) @@ -0,0 +1,19 @@ +GARNAME = OLE-Storage_Lite +GARVERSION = 0.18 +CATEGORIES = cpan +AUTHOR = JMCNAMARA + +DESCRIPTION = Simple Class for OLE document interface +define BLURB + This module allows you to read and write an OLE-Structured file. +endef + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpmolestoragelite,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +include gar/category.mk Added: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums 2009-03-10 12:09:17 UTC (rev 3688) @@ -0,0 +1,3 @@ +dcde0c0feeffdef3727f81a2f8844eca download/OLE-Storage_Lite-0.18.tar.gz +f32cf7396b2c68805095b6d2db05fd28 download/CSWpmolestoragelite.gspec +dcde0c0feeffdef3727f81a2f8844eca download/OLE-Storage_Lite-0.18.tar.gz Added: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec (rev 0) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec 2009-03-10 12:09:17 UTC (rev 3688) @@ -0,0 +1,11 @@ +%var bitname pm_olestoragelite +%var pkgname CSWpmolestoragelite +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright + +The OLE::Storage_Lite module is Copyright (c) 2000,2001 Kawai Takanori. Japan. All righ +ts reserved. + +You may distribute under the terms of either the GNU General Public License or the Arti +stic License, as specified in the Perl README file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 13:12:42 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 12:12:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3689] csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/ CSWpmolestoragelite.gspec Message-ID: Revision: 3689 http://gar.svn.sourceforge.net/gar/?rev=3689&view=rev Author: bonivart Date: 2009-03-10 12:12:40 +0000 (Tue, 10 Mar 2009) Log Message: ----------- OLE-Storage_Lite: fix copyright Modified Paths: -------------- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec Modified: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec 2009-03-10 12:09:17 UTC (rev 3688) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec 2009-03-10 12:12:40 UTC (rev 3689) @@ -4,8 +4,8 @@ %include url file://%{PKGLIB}/csw_cpan.gspec %copyright -The OLE::Storage_Lite module is Copyright (c) 2000,2001 Kawai Takanori. Japan. All righ -ts reserved. +The OLE::Storage_Lite module is Copyright (c) 2000,2001 Kawai Takanori. Japan. All +rights reserved. -You may distribute under the terms of either the GNU General Public License or the Arti -stic License, as specified in the Perl README file. +You may distribute under the terms of either the GNU General Public License or the +Artistic License, as specified in the Perl README file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 13:15:21 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 12:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3690] csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums Message-ID: Revision: 3690 http://gar.svn.sourceforge.net/gar/?rev=3690&view=rev Author: bonivart Date: 2009-03-10 12:15:21 +0000 (Tue, 10 Mar 2009) Log Message: ----------- OLE-Storage_Lite: fix checksum Modified Paths: -------------- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums Modified: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums 2009-03-10 12:12:40 UTC (rev 3689) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums 2009-03-10 12:15:21 UTC (rev 3690) @@ -1,3 +1,3 @@ dcde0c0feeffdef3727f81a2f8844eca download/OLE-Storage_Lite-0.18.tar.gz -f32cf7396b2c68805095b6d2db05fd28 download/CSWpmolestoragelite.gspec +c28d2147b197dda73648c4218cc18de3 download/CSWpmolestoragelite.gspec dcde0c0feeffdef3727f81a2f8844eca download/OLE-Storage_Lite-0.18.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 14:03:51 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 13:03:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3691] csw/mgar/pkg/cpan Message-ID: Revision: 3691 http://gar.svn.sourceforge.net/gar/?rev=3691&view=rev Author: bonivart Date: 2009-03-10 13:03:51 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Filesys-Df: move to GAR Added Paths: ----------- csw/mgar/pkg/cpan/Filesys-Df/ csw/mgar/pkg/cpan/Filesys-Df/branches/ csw/mgar/pkg/cpan/Filesys-Df/tags/ csw/mgar/pkg/cpan/Filesys-Df/trunk/ csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums csw/mgar/pkg/cpan/Filesys-Df/trunk/files/ csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec Property changes on: csw/mgar/pkg/cpan/Filesys-Df/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile 2009-03-10 13:03:51 UTC (rev 3691) @@ -0,0 +1,19 @@ +GARNAME = Filesys-Df +GARVERSION = 0.92 +CATEGORIES = cpan +AUTHOR = IGUTHRIE + +DESCRIPTION = Perl extension for filesystem disk space information +define BLURB + This module provides a way to obtain filesystem disk space information. +endef + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpmfilesysdf,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +include gar/category.mk Added: csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/checksums 2009-03-10 13:03:51 UTC (rev 3691) @@ -0,0 +1,3 @@ +a8b0aa3e5151a8a6c8b3067625980934 download/Filesys-Df-0.92.tar.gz +dfb40d287ccaf9c7613150cbec27a255 download/CSWpmfilesysdf.gspec +a8b0aa3e5151a8a6c8b3067625980934 download/Filesys-Df-0.92.tar.gz Added: csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec =================================================================== --- csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec (rev 0) +++ csw/mgar/pkg/cpan/Filesys-Df/trunk/files/CSWpmfilesysdf.gspec 2009-03-10 13:03:51 UTC (rev 3691) @@ -0,0 +1,7 @@ +%var bitname pm_filesysdf +%var pkgname CSWpmfilesysdf +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright + +Copyright (c) 2006 Ian Guthrie. All rights reserved. This program is free software; +you can redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 14:45:43 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 13:45:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[3692] csw/mgar/pkg/cpan Message-ID: Revision: 3692 http://gar.svn.sourceforge.net/gar/?rev=3692&view=rev Author: bonivart Date: 2009-03-10 13:45:43 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Geo-IP-PurePerl: move to GAR, update to 1.23 Added Paths: ----------- csw/mgar/pkg/cpan/Geo-IP-PurePerl/ csw/mgar/pkg/cpan/Geo-IP-PurePerl/branches/ csw/mgar/pkg/cpan/Geo-IP-PurePerl/tags/ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/checksums csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/files/ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/files/CSWpmgeoippureperl.gspec Property changes on: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2009-03-10 13:45:43 UTC (rev 3692) @@ -0,0 +1,23 @@ +GARNAME = Geo-IP-PurePerl +GARVERSION = 1.23 +CATEGORIES = cpan +AUTHOR = BORISZ + +DESCRIPTION = Look up country by IP Address +define BLURB + This Perl module enables the user to find geographical and network information of + an IP address. This is the Pure Perl version. There is also a faster implementation, + Geo::IP which is a XS wrapper around the GeoIP C library, available from CPAN +endef + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpmgeoippureperl,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWgeolitedb + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +include gar/category.mk Added: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/checksums 2009-03-10 13:45:43 UTC (rev 3692) @@ -0,0 +1,3 @@ +fad130a33f98ff04aed6a5c9c64e45c9 download/Geo-IP-PurePerl-1.23.tar.gz +c0c93e9c654e4af6a01ecd3da4d036ef download/CSWpmgeoippureperl.gspec +fad130a33f98ff04aed6a5c9c64e45c9 download/Geo-IP-PurePerl-1.23.tar.gz Added: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/files/CSWpmgeoippureperl.gspec =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/files/CSWpmgeoippureperl.gspec (rev 0) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/files/CSWpmgeoippureperl.gspec 2009-03-10 13:45:43 UTC (rev 3692) @@ -0,0 +1,10 @@ +%var bitname pm_geoippureperl +%var pkgname CSWpmgeoippureperl +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright + +Copyright (c) 2007, MaxMind LLC + +All rights reserved. This package is free software and is licensed under the GPL. +For details, see the COPYING file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 15:38:26 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 14:38:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[3693] csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile Message-ID: Revision: 3693 http://gar.svn.sourceforge.net/gar/?rev=3693&view=rev Author: bonivart Date: 2009-03-10 14:38:26 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Geo-IP-PurePerl: fix db path Modified Paths: -------------- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2009-03-10 13:45:43 UTC (rev 3692) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2009-03-10 14:38:26 UTC (rev 3693) @@ -21,3 +21,11 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod include gar/category.mk + +post-configure-modulated: + @echo " ==> Post-configure for $(GARNAME) (custom)" + @echo "$(WORKSRC)" + @( cd $(WORKSRC)/lib/Geo/IP ; \ + sed 's/\/usr\/local\/share\/GeoIP\/GeoIP.dat/\/opt\/csw\/share\/GeoIP\/GeoIP.dat/' PurePerl.pm > tmp.sed ; \ + mv tmp.sed PurePerl.pm ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 17:11:54 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 16:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[3694] csw/mgar/pkg/cpan/App-CLI/trunk Message-ID: Revision: 3694 http://gar.svn.sourceforge.net/gar/?rev=3694&view=rev Author: bonivart Date: 2009-03-10 16:11:53 +0000 (Tue, 10 Mar 2009) Log Message: ----------- App-CLI: update to 0.08 Modified Paths: -------------- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile csw/mgar/pkg/cpan/App-CLI/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/App-CLI/trunk/ Property changes on: csw/mgar/pkg/cpan/App-CLI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2009-03-10 14:38:26 UTC (rev 3693) +++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2009-03-10 16:11:53 UTC (rev 3694) @@ -1,7 +1,7 @@ GARNAME = App-CLI -GARVERSION = 0.07 +GARVERSION = 0.08 CATEGORIES = cpan -AUTHOR = CLKAO +AUTHOR = ALEXMV DESCRIPTION = Dispatcher module for command line interface programs define BLURB @@ -9,11 +9,15 @@ classes. It also supports subcommand and per-command options. endef -DISTFILES += $(call admfiles,CSWpmappcli,depend prototype) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpmappcli,) +REQUIRED_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple + DEPENDS += cpan/Locale-Maketext-Simple DEPENDS += cpan/Pod-Simple -DEPENDS += cpan/ExtUtils-AutoInstall +DEPENDS += cpan/Getopt-Long +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + include gar/category.mk - Modified: csw/mgar/pkg/cpan/App-CLI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/checksums 2009-03-10 14:38:26 UTC (rev 3693) +++ csw/mgar/pkg/cpan/App-CLI/trunk/checksums 2009-03-10 16:11:53 UTC (rev 3694) @@ -1,4 +1,3 @@ +dc376fad10f1d2457571a0e52158ff17 download/App-CLI-0.08.tar.gz 2887bfa6873bb556886bba007893979f download/CSWpmappcli.gspec -437a3323582f134dee96f11eaa60d969 download/CSWpmappcli.depend -93f00dd7c235dd75956b4072870c48ab download/CSWpmappcli.prototype -8981b0628874bb7e83b00b00e58a7259 download/App-CLI-0.07.tar.gz +dc376fad10f1d2457571a0e52158ff17 download/App-CLI-0.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 17:20:54 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 16:20:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[3695] csw/mgar/pkg/cpan/App-CLI/trunk/files Message-ID: Revision: 3695 http://gar.svn.sourceforge.net/gar/?rev=3695&view=rev Author: bonivart Date: 2009-03-10 16:20:54 +0000 (Tue, 10 Mar 2009) Log Message: ----------- App-CLI: remove depend and prototype Removed Paths: ------------- csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.depend csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.prototype Deleted: csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.depend =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.depend 2009-03-10 16:11:53 UTC (rev 3694) +++ csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.depend 2009-03-10 16:20:54 UTC (rev 3695) @@ -1,3 +0,0 @@ -P CSWpmextutautoinst pm_extutautoinst - Automatic install of dependencies via CPAN -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon -P CSWpmpodsimple pm_podsimple - framework for parsing Pod Deleted: csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.prototype =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.prototype 2009-03-10 16:11:53 UTC (rev 3694) +++ csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.prototype 2009-03-10 16:20:54 UTC (rev 3695) @@ -1,20 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/App 0755 root bin -d none /opt/csw/lib/perl/csw/auto/App/CLI 0755 root bin -f none /opt/csw/lib/perl/csw/auto/App/CLI/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/App::CLI.3perl 0444 root bin -f none /opt/csw/share/man/man3/App::CLI::Command.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/App 0755 root bin -d none /opt/csw/share/perl/csw/App/CLI 0755 root bin -f none /opt/csw/share/perl/csw/App/CLI.pm 0444 root bin -d none /opt/csw/share/perl/csw/App/CLI/Command 0755 root bin -f none /opt/csw/share/perl/csw/App/CLI/Command.pm 0444 root bin -f none /opt/csw/share/perl/csw/App/CLI/Command/Help.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 18:35:48 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 17:35:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3696] csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile Message-ID: Revision: 3696 http://gar.svn.sourceforge.net/gar/?rev=3696&view=rev Author: bonivart Date: 2009-03-10 17:35:48 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Geo-IP-PurePerl: fix Makefile Modified Paths: -------------- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile Modified: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2009-03-10 16:20:54 UTC (rev 3695) +++ csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile 2009-03-10 17:35:48 UTC (rev 3696) @@ -24,7 +24,6 @@ post-configure-modulated: @echo " ==> Post-configure for $(GARNAME) (custom)" - @echo "$(WORKSRC)" @( cd $(WORKSRC)/lib/Geo/IP ; \ sed 's/\/usr\/local\/share\/GeoIP\/GeoIP.dat/\/opt\/csw\/share\/GeoIP\/GeoIP.dat/' PurePerl.pm > tmp.sed ; \ mv tmp.sed PurePerl.pm ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 10 18:59:16 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 10 Mar 2009 17:59:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3697] csw/mgar/pkg Message-ID: Revision: 3697 http://gar.svn.sourceforge.net/gar/?rev=3697&view=rev Author: bonivart Date: 2009-03-10 17:59:16 +0000 (Tue, 10 Mar 2009) Log Message: ----------- GeoIP: move to GAR, update to 1.4.6 Added Paths: ----------- csw/mgar/pkg/GeoIP/ csw/mgar/pkg/GeoIP/branches/ csw/mgar/pkg/GeoIP/tags/ csw/mgar/pkg/GeoIP/trunk/ csw/mgar/pkg/GeoIP/trunk/Makefile csw/mgar/pkg/GeoIP/trunk/checksums csw/mgar/pkg/GeoIP/trunk/files/ Property changes on: csw/mgar/pkg/GeoIP/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2009-03-10 17:59:16 UTC (rev 3697) @@ -0,0 +1,48 @@ +GARNAME = GeoIP +GARVERSION = 1.4.6 +CATEGORIES = net + +DESCRIPTION = GeoIP C API +define BLURB + GeoIP C API +endef + +MASTER_SITES = http://geolite.maxmind.com/download/geoip/api/c/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWgeoip CSWgeoipdevel +REQUIRED_PKGS_CSWgeoip = CSWgeolitedb CSWzlib +REQUIRED_PKGS_CSWgeoipdevel = CSWgeoip +CATALOGNAME_CSWgeoip = geoip +CATALOGNAME_CSWgeoipdevel = geoip_devel + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + @echo " ==> Pre-configure for $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + sed 's/-Wall//' Makefile.am > tmp.sed ; \ + mv tmp.sed Makefile.am ; \ + sed 's/-Wall//' Makefile.in > tmp.sed ; \ + mv tmp.sed Makefile.in ; \ + cd apps ; \ + sed 's/-Wall//' Makefile.am > tmp.sed ; \ + mv tmp.sed Makefile.am ; \ + sed 's/-Wall//' Makefile.in > tmp.sed ; \ + mv tmp.sed Makefile.in ; \ + cd ../libGeoIP ; \ + sed 's/-Wall//' Makefile.am > tmp.sed ; \ + mv tmp.sed Makefile.am ; \ + sed 's/-Wall//' Makefile.in > tmp.sed ; \ + mv tmp.sed Makefile.in ; \ + cd ../test ; \ + sed 's/-Wall//' Makefile.am > tmp.sed ; \ + mv tmp.sed Makefile.am ; \ + sed 's/-Wall//' Makefile.in > tmp.sed ; \ + mv tmp.sed Makefile.in ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/GeoIP/trunk/checksums =================================================================== --- csw/mgar/pkg/GeoIP/trunk/checksums (rev 0) +++ csw/mgar/pkg/GeoIP/trunk/checksums 2009-03-10 17:59:16 UTC (rev 3697) @@ -0,0 +1 @@ +cb14b1beeb40631a12676b11ca0c309a download/GeoIP-1.4.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Tue Mar 10 21:08:58 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Tue, 10 Mar 2009 20:08:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3698] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 3698 http://gar.svn.sourceforge.net/gar/?rev=3698&view=rev Author: j_arndt Date: 2009-03-10 20:08:58 +0000 (Tue, 10 Mar 2009) Log Message: ----------- nagios: fixed dependencies, switched to SMF via cswclassutils Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-03-10 17:59:16 UTC (rev 3697) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-03-10 20:08:58 UTC (rev 3698) @@ -9,8 +9,8 @@ MASTER_SITES =$(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype postinstall ) -DISTFILES += nagios nagios.xml svc-nagios +DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype ) +DISTFILES += cswnagios PATCHFILES = patch.diff # cgi/cmd.c - GNU macro __attribute__ unknown to compiler # http://article.gmane.org/gmane.network.nagios.devel/4726 @@ -22,8 +22,12 @@ # necessary, so ginstall doesn't get -o and -g options REQUIRED_PKGS_CSWnagios = CSWapache CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt -REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin +REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin CSWcswclassutils +SPKG_CLASSES = none cswinitsmf + +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnagios$$$$/ { $$$$2 = "cswinitsmf" } { print }' + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --prefix=/opt/csw/nagios CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios @@ -61,5 +65,7 @@ @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST) @ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(HTTPD_CONF)/httpd-nagios.conf + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios @$(MAKECOOKIE) Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-03-10 17:59:16 UTC (rev 3697) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-03-10 20:08:58 UTC (rev 3698) @@ -1,13 +1,10 @@ 900e3f4164f4b2a18485420eeaefe812 download/nagios-3.0.6.tar.gz -843f2deb49d5a283d9ed88974d18d49a download/CSWnagios.gspec +725a49b8ec806a8d0c817fe4c1208b3c download/CSWnagios.gspec e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall 47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -080b1c99e3b72d6767ec5ab4461b7fe1 download/CSWnagios.prototype -2ed96c2fb28a30112681b772465bf2a6 download/CSWnagios.postinstall -eee3268b11eb94d797f0f606d53cfb97 download/nagios -2bca004216ac8d8774e8bf3f974eca10 download/nagios.xml -66adfde9e041150b29e31ea8f8c0b604 download/svc-nagios +92467193beb7d39c7a56a520731cfb5c download/CSWnagios.prototype +eee3268b11eb94d797f0f606d53cfb97 download/cswnagios 0ef601e30d01a511822dd27df6b0e531 download/patch.diff 4faa5ec86586be23dfbbd9165f50046d download/configure.diff f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec 2009-03-10 17:59:16 UTC (rev 3697) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.gspec 2009-03-10 20:08:58 UTC (rev 3698) @@ -1,8 +1,3 @@ %var bitname nagios %var pkgname CSWnagios -%var SERVICE_CONF_FILES /opt/csw/nagios/etc/nagios.cfg -%var RC_INIT_SCRIPT nagios -%var SMF_SCRIPT svc-nagios -%var SMF_MANIFEST nagios.xml %include url file://%{PKGLIB}/csw_dyndepend.gspec -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-10 17:59:16 UTC (rev 3697) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-10 20:08:58 UTC (rev 3698) @@ -385,9 +385,9 @@ f none /opt/csw/share/doc/nagios/README 0644 root bin f none /opt/csw/share/doc/nagios/UPGRADING 0644 root bin f none /opt/csw/share/doc/nagios/LICENSE 0644 root bin +f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin i checkinstall=CSWnagios.checkinstall i preinstall=CSWnagios.preinstall i depend=CSWnagios.depend i pkginfo=CSWnagios.pkginfo -i postinstall=CSWnagios.postinstall i preremove=CSWnagios.preremove This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Mar 10 21:23:03 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 10 Mar 2009 20:23:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3699] csw/mgar/pkg Message-ID: Revision: 3699 http://gar.svn.sourceforge.net/gar/?rev=3699&view=rev Author: jake_goerzen Date: 2009-03-10 20:23:03 +0000 (Tue, 10 Mar 2009) Log Message: ----------- hatari: Initial commit Added Paths: ----------- csw/mgar/pkg/hatari/ csw/mgar/pkg/hatari/branches/ csw/mgar/pkg/hatari/tags/ csw/mgar/pkg/hatari/trunk/ csw/mgar/pkg/hatari/trunk/Makefile csw/mgar/pkg/hatari/trunk/files/ Property changes on: csw/mgar/pkg/hatari/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hatari/trunk/Makefile 2009-03-10 20:23:03 UTC (rev 3699) @@ -0,0 +1,25 @@ +GARNAME = hatari +GARVERSION = 1.2.0 +CATEGORIES = apps + +DESCRIPTION = Atari ST emulator +define BLURB +Hatari is an Atari ST and STE emulator for GNU/Linux, BSD, BeOS, Mac OS X and other systems that are supported by the SDL library. +endef + +MASTER_SITES = http://download.berlios.de/hatari/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(call admfiles,CSWhatari,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Tue Mar 10 21:34:30 2009 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 10 Mar 2009 21:34:30 +0100 Subject: [csw-devel] SF.net SVN: gar:[3699] csw/mgar/pkg In-Reply-To: References: Message-ID: <625385e30903101334h4ddf788cldbe54e56460a3e66@mail.gmail.com> On Tue, Mar 10, 2009 at 9:23 PM, wrote: > +DESCRIPTION = Atari ST emulator > +define BLURB > +Hatari is an Atari ST and STE emulator for GNU/Linux, BSD, BeOS, Mac OS X and other systems that are supported by the SDL library. > +endef Atari vs. Amiga...those were the days... :-) -- /peter From bonivart at opencsw.org Tue Mar 10 21:46:10 2009 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 10 Mar 2009 21:46:10 +0100 Subject: [csw-devel] SF.net SVN: gar:[3698] csw/mgar/pkg/nagios/trunk In-Reply-To: References: Message-ID: <625385e30903101346t4592cfbp64089425a3a99a9@mail.gmail.com> On Tue, Mar 10, 2009 at 9:08 PM, wrote: > nagios: fixed dependencies, switched to SMF via cswclassutils Cool! > +PROTOTYPE_FILTER ?= awk '$$$$3 ~ /\/init.d\/cswnagios$$$$/ { $$$$2 = "cswinitsmf" } { print }' You shouldn't need the prototype filter when you have a static prototype, you have already assigned the correct class to cswnagios below: > Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype > =================================================================== > --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-10 17:59:16 UTC (rev 3697) > +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-10 20:08:58 UTC (rev 3698) > @@ -385,9 +385,9 @@ > ?f none /opt/csw/share/doc/nagios/README 0644 root bin > ?f none /opt/csw/share/doc/nagios/UPGRADING 0644 root bin > ?f none /opt/csw/share/doc/nagios/LICENSE 0644 root bin > +f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin > ?i checkinstall=CSWnagios.checkinstall > ?i preinstall=CSWnagios.preinstall > ?i depend=CSWnagios.depend > ?i pkginfo=CSWnagios.pkginfo > -i postinstall=CSWnagios.postinstall > ?i preremove=CSWnagios.preremove -- /peter From wbonnet at users.sourceforge.net Tue Mar 10 23:46:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 10 Mar 2009 22:46:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3700] csw/mgar/pkg/dbus-glib/trunk Message-ID: Revision: 3700 http://gar.svn.sourceforge.net/gar/?rev=3700&view=rev Author: wbonnet Date: 2009-03-10 22:46:21 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Update to 0.80 Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile csw/mgar/pkg/dbus-glib/trunk/checksums csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec Property Changed: ---------------- csw/mgar/pkg/dbus-glib/trunk/ Property changes on: csw/mgar/pkg/dbus-glib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2009-03-10 20:23:03 UTC (rev 3699) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2009-03-10 22:46:21 UTC (rev 3700) @@ -23,17 +23,18 @@ DISTFILES += $(call admfiles,CSWdbusglibdev, ) REQUIRED_PKGS_CSWdbusglibdev = CSWdbusglib -REQUIRED_PKGS_CSWdbusglib = CSWexpat CSWggettext CSWglib2 CSWiconv CSWsunmath CSWlibdbus +REQUIRED_PKGS_CSWdbusglib = CSWexpat CSWggettextrt CSWglib2 CSWiconv CSWsunmath CSWlibdbus PKGFILES_CSWdbusglibdev = $(PKGFILES_DEVEL) -PKGFILES_CSWdbusglibdev += $(prefix)/include/.* -PKGFILES_CSWdbusglibdev += $(prefix)/lib/.*\.a -PKGFILES_CSWdbusglibdev += $(prefix)/lib/pkgconfig/.* +# PKGFILES_CSWdbusglibdev += $(prefix)/include/.* +# PKGFILES_CSWdbusglibdev += $(prefix)/lib/.*\.a +# PKGFILES_CSWdbusglibdev += $(prefix)/lib/pkgconfig/.* CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0 CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include -CONFIGURE_ARGS += --disable-tests +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-tests include gar/category.mk Modified: csw/mgar/pkg/dbus-glib/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/checksums 2009-03-10 20:23:03 UTC (rev 3699) +++ csw/mgar/pkg/dbus-glib/trunk/checksums 2009-03-10 22:46:21 UTC (rev 3700) @@ -1,3 +1,3 @@ 86ea60ba2118a1b9deafe8257f6a6a1a download/dbus-glib-0.80.tar.gz -461abd981eb75cd3965976fed9c5b0ba download/CSWdbusglib.gspec -2c62e1c94b10fa4505a2a395ec5abf25 download/CSWdbusglibdev.gspec +a5b394c2ed12ae94e9bba419f898a873 download/CSWdbusglib.gspec +169d27fcdd5d1ea79adc81ebab670011 download/CSWdbusglibdev.gspec Modified: csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec 2009-03-10 20:23:03 UTC (rev 3699) +++ csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglib.gspec 2009-03-10 22:46:21 UTC (rev 3700) @@ -1,4 +1,6 @@ %var bitname dbus_glib %var pkgname CSWdbusglib %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}/license for license information Modified: csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec 2009-03-10 20:23:03 UTC (rev 3699) +++ csw/mgar/pkg/dbus-glib/trunk/files/CSWdbusglibdev.gspec 2009-03-10 22:46:21 UTC (rev 3700) @@ -1,4 +1,6 @@ %var bitname dbus_glibdev -%var desc DBus GLib Bindings Headers +%var pkgname CSWdbusglibdev %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/%{GARNAME}dev/license for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Mar 11 00:21:00 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 10 Mar 2009 23:21:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[3701] csw/mgar/pkg Message-ID: Revision: 3701 http://gar.svn.sourceforge.net/gar/?rev=3701&view=rev Author: wbonnet Date: 2009-03-10 23:21:00 +0000 (Tue, 10 Mar 2009) Log Message: ----------- Initial import Added Paths: ----------- csw/mgar/pkg/thunderbird/ csw/mgar/pkg/thunderbird/Makefile csw/mgar/pkg/thunderbird/branches/ csw/mgar/pkg/thunderbird/tags/ csw/mgar/pkg/thunderbird/trunk/ csw/mgar/pkg/thunderbird/trunk/Makefile csw/mgar/pkg/thunderbird/trunk/checksums csw/mgar/pkg/thunderbird/trunk/files/ csw/mgar/pkg/thunderbird/trunk/files/CSWthunderbird.gspec csw/mgar/pkg/thunderbird/trunk/files/thunderbird.desktop csw/mgar/pkg/thunderbird/trunk/files/thunderbird.keys Added: csw/mgar/pkg/thunderbird/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/Makefile (rev 0) +++ csw/mgar/pkg/thunderbird/Makefile 2009-03-10 23:21:00 UTC (rev 3701) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/thunderbird/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/thunderbird/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/trunk/Makefile (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/Makefile 2009-03-10 23:21:00 UTC (rev 3701) @@ -0,0 +1,59 @@ +GARNAME = thunderbird +GARVERSION = 2.0.0.19 +CATEGORIES = apps +DISTNAME = $(GARNAME) + +DESCRIPTION = Mozilla Thunderbird Mail Client +define BLURB + Thunderbird 2 is the next generation release of the award-winning Thunderbird email client from Mozilla. +endef + +MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$(GARVERSION)/source/ +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 +DISTFILES += $(call admfiles,CSWthunderbird, ) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) +UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/ + +CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/thunderbird + +CFLAGS+= -DG_HAVE_ISO_VARARGS +CXXFLAGS+= -DG_HAVE_ISO_VARARGS +LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/thunderbird/lib -R/opt/csw/mozilla/thunderbird/lib -L/opt/csw/lib -R/opt/csw/lib + +export PERL CFLAGS CXXFLAGS LDFLAGS + +PKGS_REQUIRED_CSWthunderbird = CSWbonobo2 CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring CSWgnomevfs2 +PKGS_REQUIRED_CSWthunderbird += CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo CSWlibgnome CSWlibgnomecanvas +PKGS_REQUIRED_CSWthunderbird += CSWlibgnomeui CSWlibidl CSWlibpopt CSWlibxft2 CSWlibxrender CSWorbit2 CSWpango CSWzlib + +#PATCHFILES = autoconf.mk.in.diff + +TEST_SCRIPTS = + +post-extract: + @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) + @$(MAKECOOKIE) + +pre-configure: + @cp $(FILEDIR)/.mozconfig $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)/.mozconfig + +pre-install: + ( if [ ! -d $(DESTDIR)/opt/csw/bin ] ; then mkdir -p $(DESTDIR)/opt/csw/bin ; fi ) + ( cd $(DESTDIR)/opt/csw/bin && rm -f thunderbird && ln -s ../mozilla/thunderbird/bin/thunderbird . ) + ( mkdir -p $(DESTDIR)/opt/csw/share/pixmaps ) +# ( cp $(WORKDIR)/$(DISTNAME)/other-licenses/branding/thunderbird/mozicon128.png $(DESTDIR)/opt/csw/share/pixmaps/thunderbird.png ) + ( mkdir -p $(DESTDIR)/opt/csw/share/applications ) + ( cp $(FILEDIR)/thunderbird.desktop $(DESTDIR)/opt/csw/share/applications/thunderbird.desktop ) + ( mkdir -p $(DESTDIR)/opt/csw/share/gnome/mime-info ) + ( cp $(FILEDIR)/thunderbird.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/thunderbird.keys ) + +post-install: + ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) +# ( gfind $(DESTDIR)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; ) +# ( gfind $(DESTDIR)/opt/csw/mozilla/thunderbird -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; ) +# ( gfind $(DESTDIR)/opt/csw/mozilla/thunderbird -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) + +include gar/category.mk + Added: csw/mgar/pkg/thunderbird/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird/trunk/checksums (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/checksums 2009-03-10 23:21:00 UTC (rev 3701) @@ -0,0 +1,2 @@ +546e81748f5f8bf06cacbcb8c358395f download/thunderbird-2.0.0.19-source.tar.bz2 +3a6b0245afd9c4e8b624f2455767574e download/CSWthunderbird.gspec Added: csw/mgar/pkg/thunderbird/trunk/files/CSWthunderbird.gspec =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/CSWthunderbird.gspec (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/CSWthunderbird.gspec 2009-03-10 23:21:00 UTC (rev 3701) @@ -0,0 +1,6 @@ +%var bitname thunderbird +%var pkgname CSWthunderbird +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/thunderbird/LICENSE.txt for license information Added: csw/mgar/pkg/thunderbird/trunk/files/thunderbird.desktop =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/thunderbird.desktop (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/thunderbird.desktop 2009-03-10 23:21:00 UTC (rev 3701) @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Thunderbird +Comment=Thunderbird Community Edition +TryExec=Thunderbird +Exec=thunderbird %u +Icon=thunderbird.png +MimeType=text/html; +Categories=Application;Network; Added: csw/mgar/pkg/thunderbird/trunk/files/thunderbird.keys =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/thunderbird.keys (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/thunderbird.keys 2009-03-10 23:21:00 UTC (rev 3701) @@ -0,0 +1,8 @@ +-------thunderbird.keys------------ +text/html + description=HyperText Markup Language File + icon_filename=i-thunderbird.png + default_action=application + short_list_application_ids_for_novice_user_level=thunderbird + category=Network +----------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 02:04:02 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 01:04:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[3702] csw/mgar/pkg Message-ID: Revision: 3702 http://gar.svn.sourceforge.net/gar/?rev=3702&view=rev Author: hson Date: 2009-03-11 01:03:57 +0000 (Wed, 11 Mar 2009) Log Message: ----------- dsniff: Initial commit Added Paths: ----------- csw/mgar/pkg/dsniff/ csw/mgar/pkg/dsniff/branches/ csw/mgar/pkg/dsniff/tags/ csw/mgar/pkg/dsniff/trunk/ csw/mgar/pkg/dsniff/trunk/Makefile csw/mgar/pkg/dsniff/trunk/checksums csw/mgar/pkg/dsniff/trunk/files/ csw/mgar/pkg/dsniff/trunk/files/buildpatch Property changes on: csw/mgar/pkg/dsniff/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/dsniff/trunk/Makefile =================================================================== --- csw/mgar/pkg/dsniff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dsniff/trunk/Makefile 2009-03-11 01:03:57 UTC (rev 3702) @@ -0,0 +1,36 @@ +GARNAME = dsniff +GARVERSION = 2.4b1 +CATEGORIES = net + +DESCRIPTION = a collection of tools for network auditing and penetration testing +define BLURB + dsniff is a collection of tools for network auditing and penetration testing. + dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor + a network for interesting data (passwords, e-mail, files, etc.). arpspoof, + dnsspoof, and macof facilitate the interception of network traffic normally + unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and + webmitm implement active monkey-in-the-middle attacks against redirected SSH + and HTTPS sessions by exploiting weak bindings in ad-hoc PKI. +endef + +MASTER_SITES = http://www.monkey.org/~dugsong/dsniff/beta/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +DISTNAME = $(GARNAME)-2.4 + +REQUIRED_PKGS += > CSWbdb3 CSWlibnet CSWlibnids CSWlibpcap CSWosslrt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +PATCHFILES = buildpatch + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/dsniff/trunk/checksums =================================================================== --- csw/mgar/pkg/dsniff/trunk/checksums (rev 0) +++ csw/mgar/pkg/dsniff/trunk/checksums 2009-03-11 01:03:57 UTC (rev 3702) @@ -0,0 +1,2 @@ +2f761fa3475682a7512b0b43568ee7d6 download/dsniff-2.4b1.tar.gz +feadae3ebb68b842135aac67e98ce308 download/buildpatch Added: csw/mgar/pkg/dsniff/trunk/files/buildpatch =================================================================== --- csw/mgar/pkg/dsniff/trunk/files/buildpatch (rev 0) +++ csw/mgar/pkg/dsniff/trunk/files/buildpatch 2009-03-11 01:03:57 UTC (rev 3702) @@ -0,0 +1,11161 @@ +diff -ru dsniff-2.4.orig/Makefile.in dsniff-2.4/Makefile.in +--- dsniff-2.4.orig/Makefile.in 2001-03-15 09:34:42.000000000 +0100 ++++ dsniff-2.4/Makefile.in 2009-03-11 01:43:52.307240759 +0100 +@@ -139,20 +139,20 @@ + $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB) + + install: +- test -d $(install_prefix)$(sbindir) || \ +- $(INSTALL) -d $(install_prefix)$(sbindir) ++ test -d $(DESTDIR)$(install_prefix)$(sbindir) || \ ++ $(INSTALL) -d $(DESTDIR)$(install_prefix)$(sbindir) + for file in $(PROGS); do \ +- $(INSTALL_PROGRAM) -m 755 $$file $(install_prefix)$(sbindir); \ ++ $(INSTALL_PROGRAM) -m 755 $$file $(DESTDIR)$(install_prefix)$(sbindir); \ + done +- test -d $(install_prefix)$(libdir) || \ +- $(INSTALL) -d $(install_prefix)$(libdir) ++ test -d $(DESTDIR)$(install_prefix)$(libdir) || \ ++ $(INSTALL) -d $(DESTDIR)$(install_prefix)$(libdir) + for file in $(CONFIGS); do \ +- $(INSTALL_DATA) $$file $(install_prefix)$(libdir); \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(install_prefix)$(libdir); \ + done +- test -d $(install_prefix)$(mandir)/man8 || \ +- $(INSTALL) -d $(install_prefix)$(mandir)/man8 ++ test -d $(DESTDIR)$(install_prefix)$(mandir)/man8 || \ ++ $(INSTALL) -d $(DESTDIR)$(install_prefix)$(mandir)/man8 + for file in *.8; do \ +- $(INSTALL_DATA) $$file $(install_prefix)$(mandir)/man8; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(install_prefix)$(mandir)/man8; \ + done + + clean: +diff -ru dsniff-2.4.orig/config.h.in dsniff-2.4/config.h.in +--- dsniff-2.4.orig/config.h.in 2000-11-28 19:20:14.000000000 +0100 ++++ dsniff-2.4/config.h.in 2009-03-11 01:25:42.000000000 +0100 +@@ -1,26 +1,4 @@ +-/* config.h.in. Generated automatically from configure.in by autoheader. */ +- +-/* Define to empty if the keyword does not work. */ +-#undef const +- +-/* Define if you have the strftime function. */ +-#undef HAVE_STRFTIME +- +-/* Define as the return type of signal handlers (int or void). */ +-#undef RETSIGTYPE +- +-/* Define to `unsigned' if doesn't define. */ +-#undef size_t +- +-/* Define if you have the ANSI C header files. */ +-#undef STDC_HEADERS +- +-/* Define if your declares struct tm. */ +-#undef TM_IN_SYS_TIME +- +-/* Define if the X Window System is missing or not being used. */ +-#undef X_DISPLAY_MISSING +- ++/* config.h.in. Generated from configure.in by autoheader. */ + /* Define to 'uint32_t' if doesn't define. */ + #undef u_int32_t + +@@ -39,72 +17,145 @@ + /* Should be in , *sigh* */ + #undef HAVE_MINMAX + #ifndef HAVE_MINMAX +-#define MIN(a,b) (((a)<(b))?(a):(b)) +-#define MAX(a,b) (((a)>(b))?(a):(b)) ++#define MIN(a,b) (((a)<(b))?(a):(b)) ++#define MAX(a,b) (((a)>(b))?(a):(b)) + #endif + +-/* Define if you have the MD5Update function. */ +-#undef HAVE_MD5UPDATE + +-/* Define if you have the dirname function. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_ALLOCA_H ++ ++/* Define to 1 if you have the `dirname' function. */ + #undef HAVE_DIRNAME + +-/* Define if you have the ether_ntoa function. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_ERR_H ++ ++/* Define to 1 if you have the `ether_ntoa' function. */ + #undef HAVE_ETHER_NTOA + +-/* Define if you have the gethostname function. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_FCNTL_H ++ ++/* Define to 1 if you have the `gethostname' function. */ + #undef HAVE_GETHOSTNAME + +-/* Define if you have the socket function. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LIBGEN_H ++ ++/* Define to 1 if you have the `nsl' library (-lnsl). */ ++#undef HAVE_LIBNSL ++ ++/* Define to 1 if you have the `resolv' library (-lresolv). */ ++#undef HAVE_LIBRESOLV ++ ++/* Define to 1 if you have the `rpcsvc' library (-lrpcsvc). */ ++#undef HAVE_LIBRPCSVC ++ ++/* Define to 1 if you have the `socket' library (-lsocket). */ ++#undef HAVE_LIBSOCKET ++ ++/* Define to 1 if you have the `MD5Update' function. */ ++#undef HAVE_MD5UPDATE ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NET_IF_TUN_H ++ ++/* Define to 1 if you have the `socket' function. */ + #undef HAVE_SOCKET + +-/* Define if you have the strdup function. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the `strdup' function. */ + #undef HAVE_STRDUP + +-/* Define if you have the strlcat function. */ ++/* Define to 1 if you have the `strftime' function. */ ++#undef HAVE_STRFTIME ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the `strlcat' function. */ + #undef HAVE_STRLCAT + +-/* Define if you have the strlcpy function. */ ++/* Define to 1 if you have the `strlcpy' function. */ + #undef HAVE_STRLCPY + +-/* Define if you have the strsep function. */ ++/* Define to 1 if you have the `strsep' function. */ + #undef HAVE_STRSEP + +-/* Define if you have the strstr function. */ ++/* Define to 1 if you have the `strstr' function. */ + #undef HAVE_STRSTR + +-/* Define if you have the warnx function. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_IOCTL_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_QUEUE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `warnx' function. */ + #undef HAVE_WARNX + +-/* Define if you have the header file. */ +-#undef HAVE_ERR_H ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT + +-/* Define if you have the header file. */ +-#undef HAVE_FCNTL_H ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME + +-/* Define if you have the header file. */ +-#undef HAVE_LIBGEN_H ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING + +-/* Define if you have the header file. */ +-#undef HAVE_NET_IF_TUN_H ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME + +-/* Define if you have the header file. */ +-#undef HAVE_SYS_IOCTL_H ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION + +-/* Define if you have the header file. */ +-#undef HAVE_SYS_QUEUE_H ++/* Define as the return type of signal handlers (`int' or `void'). */ ++#undef RETSIGTYPE + +-/* Define if you have the header file. */ +-#undef HAVE_UNISTD_H ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS + +-/* Define if you have the nsl library (-lnsl). */ +-#undef HAVE_LIBNSL ++/* Define to 1 if your declares `struct tm'. */ ++#undef TM_IN_SYS_TIME + +-/* Define if you have the resolv library (-lresolv). */ +-#undef HAVE_LIBRESOLV ++/* Define to 1 if the X Window System is missing or not being used. */ ++#undef X_DISPLAY_MISSING + +-/* Define if you have the rpcsvc library (-lrpcsvc). */ +-#undef HAVE_LIBRPCSVC ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const + +-/* Define if you have the socket library (-lsocket). */ +-#undef HAVE_LIBSOCKET ++/* Define to `u_int32_t' if does not define. */ ++#undef in_addr_t ++ ++/* Define to `unsigned int' if does not define. */ ++#undef size_t ++ ++/* Define to `uint32_t' if does not define. */ ++#undef u_int32_t ++ ++/* Define to `uint64_t' if does not define. */ ++#undef u_int64_t +diff -ru dsniff-2.4.orig/configure dsniff-2.4/configure +--- dsniff-2.4.orig/configure 2001-03-19 07:52:37.000000000 +0100 ++++ dsniff-2.4/configure 2009-03-11 01:25:40.000000000 +0100 +@@ -1,38 +1,742 @@ + #! /bin/sh +- + # Guess values for system-dependent variables and create Makefiles. +-# Generated automatically using autoconf version 2.13 +-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. ++# Generated by GNU Autoconf 2.63. + # ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ case $as_dir in ++ /*) ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # Try only shells that exist, to save several forks. ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { ("$as_shell") 2> /dev/null <<\_ASEOF ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell bug-autoconf at gnu.org about your system, ++ echo including any error possibly output before this message. ++ echo This can help us improve future autoconf versions. ++ echo Configuration will now proceed without shell functions. ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else ++ as_ln_s='cp -p' ++ fi ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +-# Defaults: +-ac_help= ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++ ++exec 7<&0 &1 ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# so uname gets run too. ++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ++ ++# ++# Initializations. ++# + ac_default_prefix=/usr/local +-# Any additions from configure.in: +-ac_help="$ac_help +- --with-x use the X Window System" +-ac_help="$ac_help +- --with-db=DIR use Berkeley DB (with --enable-compat185) in DIR" +-ac_help="$ac_help +- --with-libpcap=DIR use libpcap in DIR" +-ac_help="$ac_help +- --with-libnet=DIR use libnet in DIR" +-ac_help="$ac_help +- --with-libnids=DIR use libnids in DIR" +-ac_help="$ac_help +- --with-openssl=DIR use OpenSSL in DIR" ++ac_clean_files= ++ac_config_libobj_dir=. ++LIBOBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++# Identity of this package. ++PACKAGE_NAME= ++PACKAGE_TARNAME= ++PACKAGE_VERSION= ++PACKAGE_STRING= ++PACKAGE_BUGREPORT= ++ ++ac_unique_file="dsniff.c" ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include ++#ifdef HAVE_SYS_TYPES_H ++# include ++#endif ++#ifdef HAVE_SYS_STAT_H ++# include ++#endif ++#ifdef STDC_HEADERS ++# include ++# include ++#else ++# ifdef HAVE_STDLIB_H ++# include ++# endif ++#endif ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H ++# include ++# endif ++# include ++#endif ++#ifdef HAVE_STRINGS_H ++# include ++#endif ++#ifdef HAVE_INTTYPES_H ++# include ++#endif ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif" ++ ++ac_subst_vars='LTLIBOBJS ++SSLLIB ++SSLINC ++NIDSLIB ++NIDSINC ++LNETLIB ++LNETINC ++PCAPLIB ++PCAPINC ++DBLIB ++DBINC ++WEBSPY ++TCPHIJACK ++LIBOBJS ++EGREP ++GREP ++X_EXTRA_LIBS ++X_LIBS ++X_PRE_LIBS ++X_CFLAGS ++CPP ++XMKMF ++RANLIB ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' ++ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++with_x ++with_db ++with_libpcap ++with_libnet ++with_libnids ++with_openssl ++' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++XMKMF ++CPP' ++ + + # Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. +-build=NONE +-cache_file=./config.cache ++cache_file=/dev/null + exec_prefix=NONE +-host=NONE + no_create= +-nonopt=NONE + no_recursion= + prefix=NONE + program_prefix=NONE +@@ -41,94 +745,133 @@ + silent= + site= + srcdir= +-target=NONE + verbose= + x_includes=NONE + x_libraries=NONE ++ ++# Installation directory options. ++# These are left unexpanded so users can "make install exec_prefix=/foo" ++# and all the variables that are supposed to be based on exec_prefix ++# by default will actually change. ++# Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' +- +-# Initialize some other variables. +-subdirs= +-MFLAGS= MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} +-# Maximum number of lines to put in a shell here document. +-ac_max_here_lines=12 ++docdir='${datarootdir}/doc/${PACKAGE}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' + + ac_prev= ++ac_dashdash= + for ac_option + do +- + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then +- eval "$ac_prev=\$ac_option" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- case "$ac_option" in +- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +- *) ac_optarg= ;; ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case "$ac_option" in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir="$ac_optarg" ;; ++ bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) +- ac_prev=build ;; ++ ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build="$ac_optarg" ;; ++ build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- cache_file="$ac_optarg" ;; ++ cache_file=$ac_optarg ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ --config-cache | -C) ++ cache_file=config.cache ;; ++ ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) +- datadir="$ac_optarg" ;; ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) ++ datadir=$ac_optarg ;; ++ ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- eval "enable_${ac_feature}=no" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 ++ { (exit 1); exit 1; }; } ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; +- *) ac_optarg=yes ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 ++ { (exit 1); exit 1; }; } ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; + esac +- eval "enable_${ac_feature}='$ac_optarg'" ;; ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -137,116 +880,77 @@ + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) +- exec_prefix="$ac_optarg" ;; ++ exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + +- -help | --help | --hel | --he) +- # Omit some internal or obsolete options to make the list less imposing. +- # This message is too long to be a string in the A/UX 3.1 sh. +- cat << EOF +-Usage: configure [options] [host] +-Options: [defaults in brackets after descriptions] +-Configuration: +- --cache-file=FILE cache test results in FILE +- --help print this message +- --no-create do not create output files +- --quiet, --silent do not print \`checking...' messages +- --version print the version of autoconf that created configure +-Directory and file names: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [same as prefix] +- --bindir=DIR user executables in DIR [EPREFIX/bin] +- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] +- --libexecdir=DIR program executables in DIR [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data in DIR +- [PREFIX/share] +- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data in DIR +- [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] +- --libdir=DIR object code libraries in DIR [EPREFIX/lib] +- --includedir=DIR C header files in DIR [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] +- --infodir=DIR info documentation in DIR [PREFIX/info] +- --mandir=DIR man documentation in DIR [PREFIX/man] +- --srcdir=DIR find the sources in DIR [configure dir or ..] +- --program-prefix=PREFIX prepend PREFIX to installed program names +- --program-suffix=SUFFIX append SUFFIX to installed program names +- --program-transform-name=PROGRAM +- run sed PROGRAM on installed program names +-EOF +- cat << EOF +-Host type: +- --build=BUILD configure for building on BUILD [BUILD=HOST] +- --host=HOST configure for HOST [guessed] +- --target=TARGET configure for TARGET [TARGET=HOST] +-Features and packages: +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --x-includes=DIR X include files are in DIR +- --x-libraries=DIR X library files are in DIR +-EOF +- if test -n "$ac_help"; then +- echo "--enable and --with options recognized:$ac_help" +- fi +- exit 0 ;; ++ -help | --help | --hel | --he | -h) ++ ac_init_help=long ;; ++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) ++ ac_init_help=recursive ;; ++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) ++ ac_init_help=short ;; + + -host | --host | --hos | --ho) +- ac_prev=host ;; ++ ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) +- host="$ac_optarg" ;; ++ host_alias=$ac_optarg ;; ++ ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) +- includedir="$ac_optarg" ;; ++ includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir="$ac_optarg" ;; ++ infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir="$ac_optarg" ;; ++ libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) +- libexecdir="$ac_optarg" ;; ++ libexecdir=$ac_optarg ;; ++ ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst \ +- | --locals | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) +- localstatedir="$ac_optarg" ;; ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) ++ localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir="$ac_optarg" ;; ++ mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ++ | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +@@ -260,26 +964,26 @@ + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir="$ac_optarg" ;; ++ oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix="$ac_optarg" ;; ++ prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) +- program_prefix="$ac_optarg" ;; ++ program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) +- program_suffix="$ac_optarg" ;; ++ program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ +@@ -296,7 +1000,17 @@ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name="$ac_optarg" ;; ++ program_transform_name=$ac_optarg ;; ++ ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) +@@ -306,7 +1020,7 @@ + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) +- sbindir="$ac_optarg" ;; ++ sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +@@ -317,58 +1031,69 @@ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) +- sharedstatedir="$ac_optarg" ;; ++ sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) +- site="$ac_optarg" ;; ++ site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir="$ac_optarg" ;; ++ srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +- sysconfdir="$ac_optarg" ;; ++ sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target ;; ++ ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target="$ac_optarg" ;; ++ target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + +- -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.13" +- exit 0 ;; ++ -version | --version | --versio | --versi | --vers | -V) ++ ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; +- *) ac_optarg=yes ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 ++ { (exit 1); exit 1; }; } ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; + esac +- eval "with_${ac_package}='$ac_optarg'" ;; ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`echo $ac_option|sed -e 's/-*without-//'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- eval "with_${ac_package}=no" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 ++ { (exit 1); exit 1; }; } ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -379,375 +1104,1512 @@ + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) +- x_includes="$ac_optarg" ;; ++ x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) +- x_libraries="$ac_optarg" ;; ++ x_libraries=$ac_optarg ;; + +- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ++ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } + ;; + ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && ++ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { (exit 1); exit 1; }; } ++ eval $ac_envvar=\$ac_optarg ++ export $ac_envvar ;; ++ + *) +- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then +- echo "configure: warning: $ac_option: invalid host type" 1>&2 +- fi +- if test "x$nonopt" != xNONE; then +- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } +- fi +- nonopt="$ac_option" ++ # FIXME: should be removed in autoconf 3.0. ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac + done + + if test -n "$ac_prev"; then +- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } + fi + +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +- +-# File descriptor usage: +-# 0 standard input +-# 1 file creation +-# 2 errors and warnings +-# 3 some systems may open it to /dev/tty +-# 4 used on the Kubota Titan +-# 6 checking for... messages and results +-# 5 compiler messages saved in config.log +-if test "$silent" = yes; then +- exec 6>/dev/null +-else +- exec 6>&1 ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 ++ { (exit 1); exit 1; }; } ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac + fi +-exec 5>./config.log +- +-echo "\ +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. +-" 1>&5 + +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Also quote any args containing shell metacharacters. +-ac_configure_args= +-for ac_arg ++# Check all directory arguments for consistency. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir + do +- case "$ac_arg" in +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ;; +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) +- ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- *) ac_configure_args="$ac_configure_args $ac_arg" ;; ++ eval ac_val=\$$ac_var ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; + esac ++ # Be sure to have absolute directory names. ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++# There might be people who depend on the old broken behavior: `$host' ++# used to hold the argument of --host etc. ++# FIXME: To remove some day. ++build=$build_alias ++host=$host_alias ++target=$target_alias ++ ++# FIXME: To remove some day. ++if test "x$host_alias" != x; then ++ if test "x$build_alias" = x; then ++ cross_compiling=maybe ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used." >&2 ++ elif test "x$build_alias" != "x$host_alias"; then ++ cross_compiling=yes ++ fi ++fi ++ ++ac_tool_prefix= ++test -n "$host_alias" && ac_tool_prefix=$host_alias- ++ ++test "$silent" = yes && exec 6>/dev/null ++ ++ ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { $as_echo "$as_me: error: working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo > confdefs.h +- +-# A filename unique to this package, relative to the directory that +-# configure is in, which we can look for to find out if srcdir is correct. +-ac_unique_file=dsniff.c + + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_prog=$0 +- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` +- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + srcdir=$ac_confdir +- if test ! -r $srcdir/$ac_unique_file; then ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } +- else +- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } +- fi +-fi +-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +- +-# Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi +-fi +-for ac_site_file in $CONFIG_SITE; do +- if test -r "$ac_site_file"; then +- echo "loading site script $ac_site_file" +- . "$ac_site_file" +- fi ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 ++ { (exit 1); exit 1; }; } ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} + done + +-if test -r "$cache_file"; then +- echo "loading cache $cache_file" +- . $cache_file +-else +- echo "creating cache $cache_file" +- > $cache_file +-fi ++# ++# Report the --help message. ++# ++if test "$ac_init_help" = "long"; then ++ # Omit some internal or obsolete options to make the list less imposing. ++ # This message is too long to be a string in the A/UX 3.1 sh. ++ cat <<_ACEOF ++\`configure' configures this package to adapt to many kinds of systems. + +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-ac_exeext= +-ac_objext=o +-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then +- # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu. +- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +- ac_n= ac_c=' +-' ac_t=' ' +- else +- ac_n=-n ac_c= ac_t= +- fi ++Usage: $0 [OPTION]... [VAR=VALUE]... ++ ++To assign environment variables (e.g., CC, CFLAGS...), specify them as ++VAR=VALUE. See below for descriptions of some of the useful variables. ++ ++Defaults for the options are specified in brackets. ++ ++Configuration: ++ -h, --help display this help and exit ++ --help=short display options specific to this package ++ --help=recursive display the short help of all the included packages ++ -V, --version display version information and exit ++ -q, --quiet, --silent do not print \`checking...' messages ++ --cache-file=FILE cache test results in FILE [disabled] ++ -C, --config-cache alias for \`--cache-file=config.cache' ++ -n, --no-create do not create output files ++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] ++ ++Installation directories: ++ --prefix=PREFIX install architecture-independent files in PREFIX ++ [$ac_default_prefix] ++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX ++ [PREFIX] ++ ++By default, \`make install' will install all the files in ++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify ++an installation prefix other than \`$ac_default_prefix' using \`--prefix', ++for instance \`--prefix=\$HOME'. ++ ++For better control, use the options below. ++ ++Fine tuning of the installation directories: ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] ++_ACEOF ++ ++ cat <<\_ACEOF ++ ++X features: ++ --x-includes=DIR X include files are in DIR ++ --x-libraries=DIR X library files are in DIR ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ ++ cat <<\_ACEOF ++ ++Optional Packages: ++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-x use the X Window System ++ --with-db=DIR use Berkeley DB (with --enable-compat185) in DIR ++ --with-libpcap=DIR use libpcap in DIR ++ --with-libnet=DIR use libnet in DIR ++ --with-libnids=DIR use libnids in DIR ++ --with-openssl=DIR use OpenSSL in DIR ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L if you have libraries in a ++ nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory ++ XMKMF Path to xmkmf, Makefile generator for X Window System ++ CPP C preprocessor ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++_ACEOF ++ac_status=$? ++fi ++ ++if test "$ac_init_help" = "recursive"; then ++ # If there are subdirs, report their specific --help. ++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive ++ else ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } ++ done ++fi ++ ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++configure ++generated by GNU Autoconf 2.63 ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit ++fi ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by $as_me, which was ++generated by GNU Autoconf 2.63. Invocation command line was ++ ++ $ $0 $@ ++ ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++ ++_ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ $as_echo "PATH: $as_dir" ++done ++IFS=$as_save_IFS ++ ++} >&5 ++ ++cat >&5 <<_ACEOF ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++_ACEOF ++ ++ ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 2) ++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ ac_configure_args="$ac_configure_args '$ac_arg'" ++ ;; ++ esac ++ done ++done ++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } ++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++ ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo ++ ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo ++ ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++done ++ac_signal=0 ++ ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h ++ ++# Predefined preprocessor variables. ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ ac_site_file1=$CONFIG_SITE ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test -r "$ac_site_file"; then ++ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done ++ ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special ++ # files actually), so we avoid doing that. ++ if test -f "$cache_file"; then ++ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi + else +- ac_n= ac_c='\c' ac_t= ++ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { (exit 1); exit 1; }; } + fi + + + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++ac_config_headers="$ac_config_headers config.h" ++ ++ + if test "$prefix" = "NONE"; then + prefix="/usr/local" + fi + +-# Extract the first word of "gcc", so it can be a program name with args. ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:547: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="gcc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++ ++ fi ++fi + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:577: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift +- if test $# -gt 0; then ++ if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift +- set dummy "$ac_dir/$ac_word" "$@" +- shift +- ac_cv_prog_CC="$@" ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi + fi + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + +- if test -z "$CC"; then +- case "`uname -s`" in +- *win32* | *WIN32*) +- # Extract the first word of "cl", so it can be a program name with args. +-set dummy cl; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:628: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="cl" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else +- echo "$ac_t""no" 1>&6 +-fi +- ;; +- esac +- fi +- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:660: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="$ac_prog" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +-cat > conftest.$ac_ext << EOF + +-#line 671 "configure" +-#include "confdefs.h" ++ test -n "$ac_ct_CC" && break ++done + +-main(){return(0);} +-EOF +-if { (eval echo configure:676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- ac_cv_prog_cc_works=yes +- # If we can't run a trivial program, we are probably using a cross compiler. +- if (./conftest; exit) 2>/dev/null; then +- ac_cv_prog_cc_cross=no ++ if test "x$ac_ct_CC" = x; then ++ CC="" + else +- ac_cv_prog_cc_cross=yes ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC + fi +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- ac_cv_prog_cc_works=no + fi +-rm -fr conftest* +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross + +-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +-if test $ac_cv_prog_cc_works = no; then +- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:702: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +-cross_compiling=$ac_cv_prog_cc_cross + +-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:707: checking whether we are using GNU C" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +- ac_cv_prog_gcc=yes ++ ++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } ++ ++# Provide some information about the compiler. ++$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ + else +- ac_cv_prog_gcc=no ++ ac_file='' + fi ++ ++{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } ++if test -z "$ac_file"; then ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: C compiler cannot create executables ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; }; } ++fi ++ ++ac_exeext=$ac_cv_exeext ++ ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 ++# If not cross compiling, check that we can run a simple program. ++if test "$cross_compiling" != yes; then ++ if { ac_try='./$ac_file' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } ++ fi ++ fi + fi ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } ++fi ++ ++rm -f conftest$ac_cv_exeext ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } ++fi ++ ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-if test $ac_cv_prog_gcc = yes; then ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_compiler_gnu=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then + GCC=yes + else + GCC= + fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-ac_test_CFLAGS="${CFLAGS+set}" +-ac_save_CFLAGS="$CFLAGS" +-CFLAGS= +-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:735: checking whether ${CC-cc} accepts -g" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cc_g=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 03:39:52 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 02:39:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3703] csw/mgar/pkg Message-ID: Revision: 3703 http://gar.svn.sourceforge.net/gar/?rev=3703&view=rev Author: hson Date: 2009-03-11 02:39:52 +0000 (Wed, 11 Mar 2009) Log Message: ----------- gengetopt: Initial commit Added Paths: ----------- csw/mgar/pkg/gengetopt/ csw/mgar/pkg/gengetopt/branches/ csw/mgar/pkg/gengetopt/tags/ csw/mgar/pkg/gengetopt/trunk/ csw/mgar/pkg/gengetopt/trunk/Makefile csw/mgar/pkg/gengetopt/trunk/checksums csw/mgar/pkg/gengetopt/trunk/files/ Property changes on: csw/mgar/pkg/gengetopt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2009-03-11 02:39:52 UTC (rev 3703) @@ -0,0 +1,30 @@ +GARNAME = gengetopt +GARVERSION = 2.22 +CATEGORIES = utils + +DESCRIPTION = parses the command line options +define BLURB + 'getgetopt' takes an easy-to-do description of options and generates a C + function that uses the GNU getopt_long(3) function to parse and validate the + options. gengetopt is perfect if you don't want to write all the stuff + required to call GNU getopt_long(3), or if you have a program and wish it + took many options. The generated code works if you use autoconf or automake. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +#PACKAGES = CSWgtar + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.gnu.org/software/gengetopt/ + +#REQUIRED_PKGS = CSWggettextrt CSWiconv + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/gengetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/gengetopt/trunk/checksums (rev 0) +++ csw/mgar/pkg/gengetopt/trunk/checksums 2009-03-11 02:39:52 UTC (rev 3703) @@ -0,0 +1 @@ +346f35c9e0607733b26dcbba9fbbfa8c download/gengetopt-2.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 03:58:09 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 02:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3704] csw/mgar/pkg Message-ID: Revision: 3704 http://gar.svn.sourceforge.net/gar/?rev=3704&view=rev Author: hson Date: 2009-03-11 02:58:08 +0000 (Wed, 11 Mar 2009) Log Message: ----------- libgc: Initial commit Added Paths: ----------- csw/mgar/pkg/libgc/ csw/mgar/pkg/libgc/branches/ csw/mgar/pkg/libgc/tags/ csw/mgar/pkg/libgc/trunk/ csw/mgar/pkg/libgc/trunk/Makefile csw/mgar/pkg/libgc/trunk/files/ Property changes on: csw/mgar/pkg/libgc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgc/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgc/trunk/Makefile 2009-03-11 02:58:08 UTC (rev 3704) @@ -0,0 +1,31 @@ +GARNAME = libgc +GARVERSION = 7.0 +CATEGORIES = lib + +DESCRIPTION = A garbage collector for C and C++ +define BLURB + The Boehm-Demers-Weiser conservative garbage collector can be used as a + garbage collecting replacement for C malloc or C++ new. It allows you to + allocate memory basically as you normally would, without explicitly + deallocating memory that is no longer useful. The collector automatically + recycles memory when it determines that it can no longer be otherwise + accessed. +endef + +MASTER_SITES = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ +DISTFILES = gc-$(GARVERSION).tar.gz + +DISTNAME = gc-$(GARVERSION) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 04:10:07 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 03:10:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[3705] csw/mgar/pkg/gengetopt/trunk/Makefile Message-ID: Revision: 3705 http://gar.svn.sourceforge.net/gar/?rev=3705&view=rev Author: hson Date: 2009-03-11 03:10:07 +0000 (Wed, 11 Mar 2009) Log Message: ----------- gengetopt: Cleanup Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/Makefile Modified: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile 2009-03-11 02:58:08 UTC (rev 3704) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2009-03-11 03:10:07 UTC (rev 3705) @@ -14,15 +14,11 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#PACKAGES = CSWgtar - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://www.gnu.org/software/gengetopt/ -#REQUIRED_PKGS = CSWggettextrt CSWiconv - CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 04:25:12 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 03:25:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[3706] csw/mgar/pkg/libnids/trunk Message-ID: Revision: 3706 http://gar.svn.sourceforge.net/gar/?rev=3706&view=rev Author: hson Date: 2009-03-11 03:25:12 +0000 (Wed, 11 Mar 2009) Log Message: ----------- libnids: Remove inline-gccism Modified Paths: -------------- csw/mgar/pkg/libnids/trunk/checksums csw/mgar/pkg/libnids/trunk/files/mainpatch Modified: csw/mgar/pkg/libnids/trunk/checksums =================================================================== --- csw/mgar/pkg/libnids/trunk/checksums 2009-03-11 03:10:07 UTC (rev 3705) +++ csw/mgar/pkg/libnids/trunk/checksums 2009-03-11 03:25:12 UTC (rev 3706) @@ -1,2 +1,2 @@ af35e8ef403a0ca95df2da94db856428 download/libnids-1.23.tar.gz -ea5ddd010782ed77209e2414e5500ec7 download/mainpatch +f30f9291f73781869e9d1e3091d8d151 download/mainpatch Modified: csw/mgar/pkg/libnids/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-11 03:10:07 UTC (rev 3705) +++ csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-11 03:25:12 UTC (rev 3706) @@ -1,6 +1,6 @@ diff --speed-large-files --minimal -ru libnids-1.23.orig/src/Makefile.in libnids-1.23/src/Makefile.in --- libnids-1.23.orig/src/Makefile.in 2008-02-21 11:40:19.000000000 +0100 -+++ libnids-1.23/src/Makefile.in 2009-03-08 05:26:17.000000000 +0100 ++++ libnids-1.23/src/Makefile.in 2009-03-11 00:03:28.000000000 +0100 @@ -16,7 +16,7 @@ LIBSHARED = libnids.so.1.23 @@ -75,19 +75,44 @@ rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) diff --speed-large-files --minimal -ru libnids-1.23.orig/src/checksum.c libnids-1.23/src/checksum.c --- libnids-1.23.orig/src/checksum.c 2005-02-08 16:46:11.000000000 +0100 -+++ libnids-1.23/src/checksum.c 2009-03-08 11:39:55.103753000 +0100 -@@ -25,7 +25,7 @@ - return 0; ++++ libnids-1.23/src/checksum.c 2009-03-11 00:49:43.000000000 +0100 +@@ -120,7 +120,7 @@ + By Jorge Cwik , adapted for linux by Arnt + Gulbrandsen. + */ +-inline u_short ip_fast_csum(u_char * iph, u_int ihl) ++u_short ip_fast_csum(u_char * iph, u_int ihl) + { + u_int sum; + if (dontchksum(((struct ip*)iph)->ip_src.s_addr)) +@@ -191,13 +191,13 @@ + this routine is used for miscellaneous IP-like checksums, mainly in + icmp.c + */ +-inline u_short ++u_short + ip_compute_csum(u_char * buff, int len) + { + return (csum_fold(csum_partial(buff, len, 0))); } - --#if ( __i386__ || __i386 ) -+#if ( __i386__ || __i386 ) && __GNUC__ - // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels - /* +-inline u_short ++u_short + my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr) + { + if (dontchksum(saddr)) +@@ -205,7 +205,7 @@ + return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP, + csum_partial((char *)th, len, 0)); + } +-inline u_short ++u_short + my_udp_check(void *u, int len, u_int saddr, u_int daddr) + { + if (dontchksum(saddr)) diff --speed-large-files --minimal -ru libnids-1.23.orig/src/ip_options.c libnids-1.23/src/ip_options.c --- libnids-1.23.orig/src/ip_options.c 2002-08-10 21:07:45.000000000 +0200 -+++ libnids-1.23/src/ip_options.c 2009-03-08 05:26:17.000000000 +0100 ++++ libnids-1.23/src/ip_options.c 2009-03-11 00:03:28.000000000 +0100 @@ -69,7 +69,7 @@ unsigned char __pad1; unsigned char __pad2; @@ -97,3 +122,22 @@ }; struct iphdr { +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/util.c libnids-1.23/src/util.c +--- libnids-1.23.orig/src/util.c 2006-05-01 18:58:48.000000000 +0200 ++++ libnids-1.23/src/util.c 2009-03-11 00:48:59.000000000 +0100 +@@ -29,13 +29,13 @@ + return ret; + } + +-inline int ++int + before(u_int seq1, u_int seq2) + { + return ((int)(seq1 - seq2) < 0); + } + +-inline int ++int + after(u_int seq1, u_int seq2) + { + return ((int)(seq2 - seq1) < 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 04:53:27 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 03:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[3707] csw/mgar/pkg/libgc/trunk/checksums Message-ID: Revision: 3707 http://gar.svn.sourceforge.net/gar/?rev=3707&view=rev Author: hson Date: 2009-03-11 03:53:27 +0000 (Wed, 11 Mar 2009) Log Message: ----------- libgc: Add missing checksum file Added Paths: ----------- csw/mgar/pkg/libgc/trunk/checksums Added: csw/mgar/pkg/libgc/trunk/checksums =================================================================== --- csw/mgar/pkg/libgc/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgc/trunk/checksums 2009-03-11 03:53:27 UTC (rev 3707) @@ -0,0 +1 @@ +3645ccf5f32ebb27d99b27b0d29e9c38 download/gc-7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 05:44:26 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 04:44:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[3708] csw/mgar/pkg Message-ID: Revision: 3708 http://gar.svn.sourceforge.net/gar/?rev=3708&view=rev Author: hson Date: 2009-03-11 04:44:26 +0000 (Wed, 11 Mar 2009) Log Message: ----------- w3m: Initial commit Added Paths: ----------- csw/mgar/pkg/w3m/ csw/mgar/pkg/w3m/branches/ csw/mgar/pkg/w3m/tags/ csw/mgar/pkg/w3m/trunk/ csw/mgar/pkg/w3m/trunk/Makefile csw/mgar/pkg/w3m/trunk/checksums csw/mgar/pkg/w3m/trunk/files/ Property changes on: csw/mgar/pkg/w3m/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/w3m/trunk/Makefile =================================================================== --- csw/mgar/pkg/w3m/trunk/Makefile (rev 0) +++ csw/mgar/pkg/w3m/trunk/Makefile 2009-03-11 04:44:26 UTC (rev 3708) @@ -0,0 +1,38 @@ +GARNAME = w3m +GARVERSION = 0.5.2 +CATEGORIES = apps + +DESCRIPTION = Text-based web browser +define BLURB + w3m is a text-based web browser as well as a pager like `more' or `less'. + With w3m you can browse web pages through a terminal emulator window (xterm, + rxvt or something like that). Moreover, w3m can be used as a text formatting + tool which typesets HTML into plain text. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://w3m.sourceforge.net/ + +REQUIRED_PKGS += CSWggettextrt CSWlibgc CSWosslrt CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=39518 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +#LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib -R/usr/openwin/lib +#export LD_OPTIONS + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-gc=$(BUILD_PREFIX) +CONFIGURE_ARGS += --enable-image=no_ + +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/w3m/trunk/checksums =================================================================== --- csw/mgar/pkg/w3m/trunk/checksums (rev 0) +++ csw/mgar/pkg/w3m/trunk/checksums 2009-03-11 04:44:26 UTC (rev 3708) @@ -0,0 +1 @@ +ba06992d3207666ed1bf2dcf7c72bf58 download/w3m-0.5.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 05:48:08 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 04:48:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[3709] csw/mgar/pkg/dsniff/trunk/Makefile Message-ID: Revision: 3709 http://gar.svn.sourceforge.net/gar/?rev=3709&view=rev Author: hson Date: 2009-03-11 04:48:08 +0000 (Wed, 11 Mar 2009) Log Message: ----------- dsniff: Fixed typo Modified Paths: -------------- csw/mgar/pkg/dsniff/trunk/Makefile Modified: csw/mgar/pkg/dsniff/trunk/Makefile =================================================================== --- csw/mgar/pkg/dsniff/trunk/Makefile 2009-03-11 04:44:26 UTC (rev 3708) +++ csw/mgar/pkg/dsniff/trunk/Makefile 2009-03-11 04:48:08 UTC (rev 3709) @@ -18,7 +18,7 @@ DISTNAME = $(GARNAME)-2.4 -REQUIRED_PKGS += > CSWbdb3 CSWlibnet CSWlibnids CSWlibpcap CSWosslrt +REQUIRED_PKGS += CSWbdb3 CSWlibnet CSWlibnids CSWlibpcap CSWosslrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ja at baltic-online.de Wed Mar 11 07:39:06 2009 From: ja at baltic-online.de (Juergen Arndt) Date: Wed, 11 Mar 2009 07:39:06 +0100 Subject: [csw-devel] SF.net SVN: gar:[3698] csw/mgar/pkg/nagios/trunk In-Reply-To: <625385e30903101346t4592cfbp64089425a3a99a9@mail.gmail.com> References: <625385e30903101346t4592cfbp64089425a3a99a9@mail.gmail.com> Message-ID: On Tue, 10 Mar 2009 21:46:10 +0100, Peter Bonivart wrote: >> +PROTOTYPE_FILTER ?= awk '$$$$3 ~ /\/init.d\/cswnagios$$$$/ { $$$$2 = >> "cswinitsmf" } { print }' > > You shouldn't need the prototype filter when you have a static > prototype, you have already assigned the correct class to cswnagios > below: Yes, that's of course true :) Thanks for the hint! Juergen -- Juergen Arndt From wmeler at users.sourceforge.net Wed Mar 11 11:27:24 2009 From: wmeler at users.sourceforge.net (wmeler at users.sourceforge.net) Date: Wed, 11 Mar 2009 10:27:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[3710] csw/mgar/pkg/lua/trunk Message-ID: Revision: 3710 http://gar.svn.sourceforge.net/gar/?rev=3710&view=rev Author: wmeler Date: 2009-03-11 10:27:24 +0000 (Wed, 11 Mar 2009) Log Message: ----------- version 5.1.4 Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile csw/mgar/pkg/lua/trunk/checksums Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2009-03-11 04:48:08 UTC (rev 3709) +++ csw/mgar/pkg/lua/trunk/Makefile 2009-03-11 10:27:24 UTC (rev 3710) @@ -1,5 +1,5 @@ GARNAME = lua -GARVERSION = 5.0.2 +GARVERSION = 5.1.4 CATEGORIES = lang DESCRIPTION = light-weight language designed for extending applications @@ -11,14 +11,20 @@ MASTER_SITES = http://www.lua.org/ftp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += CSWlua.gspec CSWlua.prototype CSWlua.depend +DISTFILES += CSWlua.gspec +#CSWlua.prototype CSWlua.depend + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz #LIBDEPS += lib/db lib/gdbm # Configuration flags -CONFIGURE_ARGS += +CONFIGURE_SCRIPTS= +BUILD_ARGS += solaris CC=$(CC) CFLAGS=-O + +INSTALL_ARGS += INSTALL=ginstall INSTALL_TOP=$(DESTDIR)$(prefix) INSTALL_MAN=$(DESTDIR)$(mandir)/man1 + include gar/category.mk Modified: csw/mgar/pkg/lua/trunk/checksums =================================================================== --- csw/mgar/pkg/lua/trunk/checksums 2009-03-11 04:48:08 UTC (rev 3709) +++ csw/mgar/pkg/lua/trunk/checksums 2009-03-11 10:27:24 UTC (rev 3710) @@ -1 +1,2 @@ -dea74646b7e5c621fef7174df83c34b1 download/lua-5.0.2.tar.gz +d0870f2de55d59c1c8419f36e8fac150 download/lua-5.1.4.tar.gz +41542acbaa142b29bec03d70b5613088 download/CSWlua.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 12:41:40 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 11:41:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[3711] csw/mgar/pkg/libnids/trunk Message-ID: Revision: 3711 http://gar.svn.sourceforge.net/gar/?rev=3711&view=rev Author: hson Date: 2009-03-11 11:41:39 +0000 (Wed, 11 Mar 2009) Log Message: ----------- libnids: gcc-ism patch Modified Paths: -------------- csw/mgar/pkg/libnids/trunk/checksums csw/mgar/pkg/libnids/trunk/files/mainpatch Modified: csw/mgar/pkg/libnids/trunk/checksums =================================================================== --- csw/mgar/pkg/libnids/trunk/checksums 2009-03-11 10:27:24 UTC (rev 3710) +++ csw/mgar/pkg/libnids/trunk/checksums 2009-03-11 11:41:39 UTC (rev 3711) @@ -1,2 +1,2 @@ af35e8ef403a0ca95df2da94db856428 download/libnids-1.23.tar.gz -f30f9291f73781869e9d1e3091d8d151 download/mainpatch +eded3e75e8a25acf7922ba0e7593ecb1 download/mainpatch Modified: csw/mgar/pkg/libnids/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-11 10:27:24 UTC (rev 3710) +++ csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-03-11 11:41:39 UTC (rev 3711) @@ -75,7 +75,16 @@ rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) diff --speed-large-files --minimal -ru libnids-1.23.orig/src/checksum.c libnids-1.23/src/checksum.c --- libnids-1.23.orig/src/checksum.c 2005-02-08 16:46:11.000000000 +0100 -+++ libnids-1.23/src/checksum.c 2009-03-11 00:49:43.000000000 +0100 ++++ libnids-1.23/src/checksum.c 2009-03-11 12:38:07.808047165 +0100 +@@ -25,7 +25,7 @@ + return 0; + } + +-#if ( __i386__ || __i386 ) ++#if ( __i386__ || __i386 ) && __GNUC__ + // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels + + /* @@ -120,7 +120,7 @@ By Jorge Cwik , adapted for linux by Arnt Gulbrandsen. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wmeler at users.sourceforge.net Wed Mar 11 15:38:21 2009 From: wmeler at users.sourceforge.net (wmeler at users.sourceforge.net) Date: Wed, 11 Mar 2009 14:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3712] csw/mgar/pkg/lua/trunk/Makefile Message-ID: Revision: 3712 http://gar.svn.sourceforge.net/gar/?rev=3712&view=rev Author: wmeler Date: 2009-03-11 14:38:18 +0000 (Wed, 11 Mar 2009) Log Message: ----------- enable POSIX features in lua Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2009-03-11 11:41:39 UTC (rev 3711) +++ csw/mgar/pkg/lua/trunk/Makefile 2009-03-11 14:38:18 UTC (rev 3712) @@ -23,7 +23,7 @@ # Configuration flags CONFIGURE_SCRIPTS= -BUILD_ARGS += solaris CC=$(CC) CFLAGS=-O +BUILD_ARGS += solaris CC=$(CC) CFLAGS="-O -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" INSTALL_ARGS += INSTALL=ginstall INSTALL_TOP=$(DESTDIR)$(prefix) INSTALL_MAN=$(DESTDIR)$(mandir)/man1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 11 17:06:42 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 11 Mar 2009 16:06:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3713] csw/mgar/pkg/pysqlite/trunk Message-ID: Revision: 3713 http://gar.svn.sourceforge.net/gar/?rev=3713&view=rev Author: valholla Date: 2009-03-11 16:06:41 +0000 (Wed, 11 Mar 2009) Log Message: ----------- python sqlite1 support copy Modified Paths: -------------- csw/mgar/pkg/pysqlite/trunk/Makefile csw/mgar/pkg/pysqlite/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/pysqlite/trunk/ Property changes on: csw/mgar/pkg/pysqlite/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/pysqlite/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite/trunk/Makefile 2009-03-11 14:38:18 UTC (rev 3712) +++ csw/mgar/pkg/pysqlite/trunk/Makefile 2009-03-11 16:06:41 UTC (rev 3713) @@ -1,8 +1,8 @@ GARNAME = pysqlite -GARVERSION = 1.0 +GARVERSION = 1.1.8a CATEGORIES = lang -DESCRIPTION = SQLite support for Python +DESCRIPTION = SQLite 1.x support for Python define BLURB SQLite support for Python endef Modified: csw/mgar/pkg/pysqlite/trunk/checksums =================================================================== --- csw/mgar/pkg/pysqlite/trunk/checksums 2009-03-11 14:38:18 UTC (rev 3712) +++ csw/mgar/pkg/pysqlite/trunk/checksums 2009-03-11 16:06:41 UTC (rev 3713) @@ -1,2 +1,2 @@ -f21b19ff048f6bafbbfc3edb86b4c4e4 download/pysqlite-1.0.tar.gz +f5102a3cea8eab40dfd0512d44a9ef10 download/pysqlite-1.1.8a.tar.gz ab4ef10c0b2730e6b522f545b8a24b36 download/CSWpysqlite.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 11 17:35:13 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Mar 2009 16:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[3714] csw/mgar/pkg Message-ID: Revision: 3714 http://gar.svn.sourceforge.net/gar/?rev=3714&view=rev Author: bonivart Date: 2009-03-11 16:35:13 +0000 (Wed, 11 Mar 2009) Log Message: ----------- phpsysinfo: move to gar Added Paths: ----------- csw/mgar/pkg/phpsysinfo/ csw/mgar/pkg/phpsysinfo/branches/ csw/mgar/pkg/phpsysinfo/tags/ csw/mgar/pkg/phpsysinfo/trunk/ csw/mgar/pkg/phpsysinfo/trunk/Makefile csw/mgar/pkg/phpsysinfo/trunk/checksums csw/mgar/pkg/phpsysinfo/trunk/files/ csw/mgar/pkg/phpsysinfo/trunk/files/CSWphpsysinfo.class.SunOS.inc.php.p Property changes on: csw/mgar/pkg/phpsysinfo/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) @@ -0,0 +1,50 @@ +GARNAME = phpsysinfo +GARVERSION = 2.5.4 +CATEGORIES = utils + +DESCRIPTION = displays information about the host being accessed +define BLURB + displays information about the host being accessed +endef + +SF_PROJ = $(GARNAME) +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWphpsysinfo +CATALOGNAME_CSWphpsysinfo = phpsysinfo +SPKG_DESC = $(DESCRIPTION) +SPKG_SOURCEURL = http://phpsysinfo.sourceforge.net + +REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 CSWcswclassutils + +SPKG_CLASSES_CSWphpsysinfo = none cswcpsampleconf + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +WORKSRC = $(WORKDIR)/$(GARNAME) + +PROTOTYPE_FILTER = awk ' \ +$$$$3 ~ /\/config.php.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ +{ print }' + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @rm -rf $(DESTDIR)$(prefix)/share/www/phpsysinfo + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(prefix)/share/www + @cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www/phpsysinfo + @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo ; \ + mv config.php.new config.php.CSW ; \ + mv COPYING $(DESTDIR)$(docdir)/$(GARNAME)/license ) + @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo/includes/os ; \ + gpatch < ../../../../../../../../../$(FILEDIR)/CSWphpsysinfo.class.SunOS.inc.php.p ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/phpsysinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/checksums (rev 0) +++ csw/mgar/pkg/phpsysinfo/trunk/checksums 2009-03-11 16:35:13 UTC (rev 3714) @@ -0,0 +1 @@ +5bf79793255ff24d5f9cbc6a62705aa7 download/phpsysinfo-2.5.4.tar.gz Added: csw/mgar/pkg/phpsysinfo/trunk/files/CSWphpsysinfo.class.SunOS.inc.php.p =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/files/CSWphpsysinfo.class.SunOS.inc.php.p (rev 0) +++ csw/mgar/pkg/phpsysinfo/trunk/files/CSWphpsysinfo.class.SunOS.inc.php.p 2009-03-11 16:35:13 UTC (rev 3714) @@ -0,0 +1,52 @@ +--- class.SunOS.inc.php.071122 Wed Nov 21 07:34:15 2007 ++++ class.SunOS.inc.php Wed Nov 21 09:00:27 2007 +@@ -153,20 +153,27 @@ + + preg_match('/^(\D+)(\d+)$/', $ar_buf[0], $intf); + $prefix = $intf[1] . ':' . $intf[2] . ':' . $intf[1] . $intf[2] . ':'; +- $cnt = $this->kstat($prefix . 'drop'); ++ $tmp = $this->kstat($prefix); ++ if (preg_match('/:drop/',$tmp)) { ++ $cnt = $this->kstat($prefix . 'drop'); + +- if ($cnt > 0) { +- $results[$ar_buf[0]]['rx_drop'] = $cnt; +- } +- $cnt = $this->kstat($prefix . 'obytes64'); ++ if ($cnt > 0) { ++ $results[$ar_buf[0]]['rx_drop'] = $cnt; ++ } ++ } ++ if (preg_match('/:obytes64/',$tmp)) { ++ $cnt = $this->kstat($prefix . 'obytes64'); + +- if ($cnt > 0) { +- $results[$ar_buf[0]]['tx_bytes'] = $cnt; +- } +- $cnt = $this->kstat($prefix . 'rbytes64'); ++ if ($cnt > 0) { ++ $results[$ar_buf[0]]['tx_bytes'] = $cnt; ++ } ++ } ++ if (preg_match('/:rbytes64/',$tmp)) { ++ $cnt = $this->kstat($prefix . 'rbytes64'); + +- if ($cnt > 0) { +- $results[$ar_buf[0]]['rx_bytes'] = $cnt; ++ if ($cnt > 0) { ++ $results[$ar_buf[0]]['rx_bytes'] = $cnt; ++ } + } + } + } +@@ -211,6 +218,10 @@ + if (hide_mount($ar_buf[5])) { + continue; + } ++ ++ if (hide_fstype(trim($ty_buf[1]))) { ++ continue; ++ } + + $results[$j] = array(); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 11 18:38:38 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 11 Mar 2009 17:38:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3715] csw/mgar/pkg Message-ID: Revision: 3715 http://gar.svn.sourceforge.net/gar/?rev=3715&view=rev Author: valholla Date: 2009-03-11 17:38:37 +0000 (Wed, 11 Mar 2009) Log Message: ----------- commit working copy Modified Paths: -------------- csw/mgar/pkg/mysql-python/trunk/Makefile csw/mgar/pkg/mysql-python/trunk/checksums csw/mgar/pkg/pydocutils/trunk/Makefile csw/mgar/pkg/pygobject/trunk/Makefile csw/mgar/pkg/pyorbit/trunk/trunk/Makefile csw/mgar/pkg/pysetuptools/trunk/Makefile csw/mgar/pkg/pysqlite/trunk/Makefile csw/mgar/pkg/pysqlite/trunk/checksums csw/mgar/pkg/pysqlite2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pygobject/Makefile Removed Paths: ------------- csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec Property Changed: ---------------- csw/mgar/pkg/pygobject/ Modified: csw/mgar/pkg/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-python/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/mysql-python/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -12,7 +12,7 @@ PACKAGES = CSWpymysql REQUIRED_PKGS_CSWpymysql = CSWmysql5rt CSWpython CSWosslrt CSWzlib -CATALOGNAME_CSWpymysql = py_mysql5 +CATALOGNAME_CSWpymysql = pymysql5 SPKG_DESC = MySQL Support for Python # We define upstream file regex so we can be notifed of new upstream software release @@ -20,6 +20,9 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +DISTFILES += setuptools-0.6c9-py2.6.egg +PATCHFILES = setup.diff + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = @@ -33,6 +36,10 @@ mysql_prefix = $(prefix)/mysql5 mysql_bindir = $(mysql_prefix)/bin +post-extract-modulated: + @(gcp $(DOWNLOADDIR)/setuptools-0.6c9-py2.6.egg $(WORKSRC)) + + LD_OPTIONS := -R/opt/csw/mysql5/lib/mysql/\$$ISALIST $(LD_OPTIONS) PATH := $(mysql_bindir):$(PATH) export LD_OPTIONS PATH Modified: csw/mgar/pkg/mysql-python/trunk/checksums =================================================================== --- csw/mgar/pkg/mysql-python/trunk/checksums 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/mysql-python/trunk/checksums 2009-03-11 17:38:37 UTC (rev 3715) @@ -1 +1,3 @@ 532268f02870bea18c1d465e88afff30 download/MySQL-python-1.2.2.tar.gz +ca37b1ff16fa2ede6e19383e7b59245a download/setuptools-0.6c9-py2.6.egg +fba3b56e42a61b562ea4b9a5eb37a1d3 download/setup.diff Modified: csw/mgar/pkg/pydocutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/pydocutils/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pydocutils/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -12,7 +12,7 @@ PACKAGES = CSWpydocutils REQUIRED_PKGS_CSWpydocutils = CSWpython -CATALOGNAME_CSWpydocutils = py_docutils +CATALOGNAME_CSWpydocutils = pydocutils SPKG_DESC = Documentation Utiltiies for Python # We define upstream file regex so we can be notifed of new upstream software release Property changes on: csw/mgar/pkg/pygobject ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pygobject/Makefile =================================================================== --- csw/mgar/pkg/pygobject/Makefile (rev 0) +++ csw/mgar/pkg/pygobject/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/pygobject/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pygobject/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -14,8 +14,7 @@ PACKAGES = CSWpygobject REQUIRED_PKGS_CSWpygobject = CSWpython CSWggettextrt CSWglib2 - -CATALOGNAME_CSWpygobject = py_gobject +CATALOGNAME_CSWpygobject = pygobject SPKG_DESC_CSWpygobject = pygobject support for Python ## patch to change zero sized struct to zero-sized sub-object @@ -24,6 +23,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) +CONFIGURE_ARGS = $(DIRPATHS) + ## Tests require gtk, but gtk requries gobject #TEST_TARGET = check TEST_SCRIPTS = Modified: csw/mgar/pkg/pyorbit/trunk/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyorbit/trunk/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pyorbit/trunk/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -15,7 +15,7 @@ REQUIRED_PKGS_CSWpyorbit = CSWpython CSWggettextrt CSWglib2 REQUIRED_PKGS_CSWpyorbit += CSWlibidl CSWorbit2 -CATALOGNAME_CSWpyorbit = py_orbit +CATALOGNAME_CSWpyorbit = pyorbit SPKG_DESC_CSWpyorbit = ORBit2 CORBA support for Python # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pysetuptools/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -14,7 +14,7 @@ REQUIRED_PKGS_CSWpysetuptools = CSWpython PACKAGES = CSWpysetuptools -CATALOGNAME_CSWpysetuptools = py_setuptools +CATALOGNAME_CSWpysetuptools = pysetuptools SPKG_DESC_CSWpysetuptools = Distribution Utiltiies for Python @@ -23,9 +23,12 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = skip INSTALL_SCRIPTS = $(WORKSRC)/setup.py +test-skip: + $(DONADA) + INSTALL_ARGS += --root=$(DESTDIR) INSTALL_ARGS += --prefix=$(prefix) Modified: csw/mgar/pkg/pysqlite/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pysqlite/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -10,8 +10,12 @@ MASTER_SITES = $(SF_MIRROR)/$(call TOLOWER,$(GARNAME))/ WORKSRC = $(WORKDIR)/$(GARNAME) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWpysqlite.gspec +PACKAGES = CSWpysqlite +CATALOGNAME_CSWpysqlite = pysqlite +SPKG_DESC_CSWpysqlite = SQLite 1.x support for Python +REQUIRED_PKGS_CSWpysqlite = CSWpython CSWsqlite3 + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=54058 UPSTREAM_USE_SF = 1 Modified: csw/mgar/pkg/pysqlite/trunk/checksums =================================================================== --- csw/mgar/pkg/pysqlite/trunk/checksums 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pysqlite/trunk/checksums 2009-03-11 17:38:37 UTC (rev 3715) @@ -1,2 +1 @@ f5102a3cea8eab40dfd0512d44a9ef10 download/pysqlite-1.1.8a.tar.gz -ab4ef10c0b2730e6b522f545b8a24b36 download/CSWpysqlite.gspec Deleted: csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec =================================================================== --- csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec 2009-03-11 17:38:37 UTC (rev 3715) @@ -1,4 +0,0 @@ -%var bitname pysqlite -%var pkgname CSWpysqlite -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-03-11 16:35:13 UTC (rev 3714) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) @@ -12,7 +12,7 @@ PACKAGES = CSWpysqlite2 REQUIRED_PKGS_CSWpysqlite2 = CSWpython CSWsqlite3 -CATALOGNAME_CSWpysqlite2 = py_sqlite2 +CATALOGNAME_CSWpysqlite2 = pysqlite2 SPKG_DESC_CSWpysqlite2 = SQLite3 support for Python # We define upstream file regex so we can be notifed of new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 11 18:40:00 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 11 Mar 2009 17:40:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[3716] csw/mgar/pkg/clearsilver/trunk Message-ID: Revision: 3716 http://gar.svn.sourceforge.net/gar/?rev=3716&view=rev Author: valholla Date: 2009-03-11 17:40:00 +0000 (Wed, 11 Mar 2009) Log Message: ----------- commit working copy Modified Paths: -------------- csw/mgar/pkg/clearsilver/trunk/Makefile csw/mgar/pkg/clearsilver/trunk/checksums Modified: csw/mgar/pkg/clearsilver/trunk/Makefile =================================================================== --- csw/mgar/pkg/clearsilver/trunk/Makefile 2009-03-11 17:38:37 UTC (rev 3715) +++ csw/mgar/pkg/clearsilver/trunk/Makefile 2009-03-11 17:40:00 UTC (rev 3716) @@ -15,9 +15,9 @@ PACKAGES = CSWcs CSWpmcs CSWpycs -REQUIRED_PKGS_CSWcs = CSWggettext CSWzlib -REQUIRED_PKGS_CSWpmcs = CSWperl CSWzlib -REQUIRED_PKGS_CSWpycs = CSWggettext CSWpython CSWzlib +REQUIRED_PKGS_CSWcs = CSWzlib CSWggettextrt +REQUIRED_PKGS_CSWpmcs = CSWcs CSWperl +REQUIRED_PKGS_CSWpycs = CSWcs CSWpython CATALOGNAME_CSWcs = clearsilver CATALOGNAME_CSWpmcs = pm_clearsilver @@ -28,9 +28,9 @@ SPKG_DESC_CSWpycs = Clearsilver Python language binding PKGFILES_CSWpmcs = $(libdir)/perl/.* -PKGFILES_CSWpmcs += $(mandir)/*perl* +PKGFILES_CSWpmcs += $(mandir)/.*perl.* PKGFILES_CSWpycs = $(libdir)/python*/.* -PKGFILES_CSWpmcs += $(mandir)/*python* +PKGFILES_CSWpycs += $(mandir)/.*python.* GARCOMPILER = GNU @@ -38,7 +38,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) PATCHFILES += perlbuild.diff -PATCHFILES += pybuild.diff CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-python=$(bindir)/python @@ -54,9 +53,17 @@ EXTRA_LINKER_FLAGS += -lintl +ENABLE_CHECK = 0 + # No test target TEST_SCRIPTS = include gar/category.mk PATH := $(PATH):$(SOS11_CC_HOME)/bin + +## Move lone perl manpage to the package man location +post-install-modulated: + @(gmv $(INSTALLISADIR)$(prefix)/man/man3/ClearSilver.3perl \ + $(INSTALLISADIR)$(prefix)/share/man/man3/ClearSilver.3perl) + @(grm -fr $(INSTALLISADIR)$(prefix)/man/man3) Modified: csw/mgar/pkg/clearsilver/trunk/checksums =================================================================== --- csw/mgar/pkg/clearsilver/trunk/checksums 2009-03-11 17:38:37 UTC (rev 3715) +++ csw/mgar/pkg/clearsilver/trunk/checksums 2009-03-11 17:40:00 UTC (rev 3716) @@ -1,3 +1,4 @@ b8c0c7fbe0ef5e06e0c935f134304d44 download/clearsilver-0.10.5.tar.gz 1c25fda8bb2666658d8ddcf3ad9b7235 download/perlbuild.diff f951221b633994f85c45fe78008d8965 download/pybuild.diff +64cd57ea3f54da10c45046578b767d12 download/rules.mk.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 11 18:41:57 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 11 Mar 2009 17:41:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[3717] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 3717 http://gar.svn.sourceforge.net/gar/?rev=3717&view=rev Author: valholla Date: 2009-03-11 17:41:57 +0000 (Wed, 11 Mar 2009) Log Message: ----------- working copy Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums csw/mgar/pkg/subversion/trunk/files/fixme.sh Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-03-11 17:40:00 UTC (rev 3716) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-03-11 17:41:57 UTC (rev 3717) @@ -1,16 +1,16 @@ GARNAME = subversion -DISTVERSION = 1.5.5 +DISTVERSION = 1.5.6 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = utils DESCRIPTION = Version control rethought define BLURB - The goal of the Subversion project is to build a version control system that - is a compelling replacement for CVS in the open source community. + The goal of the Subversion project is to build a version control system + that is a compelling replacement for CVS in the open source community. endef # Vendor site -SPKG_SOURCEURL = http://subversion.tigris.org/ +SPKG_SOURCEURL = http://subversion.tigris.org/downloads/ # Release site MASTER_SITES = http://subversion.tigris.org/downloads/ @@ -20,10 +20,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +EXTRA_LIB = $(prefix)/bdb44/lib $(SVNLIB) +EXTRA_LIB += $(prefix)/apache2/lib +EXTRA_INC = $(prefix)/bdb44/include +EXTRA_INC += $(prefix)/apache2/include + WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn -#PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn +PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn PACKAGES += CSWpysvn CSWjavasvn SPKG_DESC_CSWsvn = Version control rethought @@ -46,9 +51,9 @@ SPKG_DESC_CSWpysvn = Subversion Python Language Binding CATALOGNAME_CSWpysvn = pysvn REQUIRED_PKGS_CSWpysvn = CSWsvn CSWpython -#SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding -#CATALOGNAME_CSWrbsvn = rbsvn -#REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby +SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding +CATALOGNAME_CSWrbsvn = rbsvn +REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) PKGFILES_CSWap2svn = $(prefix)/apache2* @@ -58,32 +63,36 @@ PKGFILES_CSWpmsvn += $(mandir)/*swig_perl* PKGFILES_CSWpysvn = $(libdir)/python* PKGFILES_CSWpysvn += $(SVNLIB)/*swig_py* -#PKGFILES_CSWrbsvn = $(libdir)/ruby* -#PKGFILES_CSWrbsvn += $(SVNLIB)/*swig_ruby* +PKGFILES_CSWrbsvn = $(libdir)/ruby* +PKGFILES_CSWrbsvn += $(SVNLIB)/*swig_ruby* DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh +DISTFILES += gccMake.sh # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html -#PATCHFILES += javahl_headers_for_nested_classes.diff -PATCHFILES += subversion155.diff +PATCHFILES += javahl_headers_for_nested_classes.diff +PATCHFILES += subversion156.diff DEPENDS = server/apache2 DEPENDS = lib/neon NODIRPATHS = --libdir --libexecdir +JDK = /usr/jdk1.5.0_15 +EXTRA_INC += $(JDK)/include SVNLIB = $(prefix)/lib/svn CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) +CONFIGURE_ARGS += --with-gnu-ld=/opt/csw/bin/gld CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --disable-mod-activation -CONFIGURE_ARGS += --with-jdk=/usr/jdk1.5.0_15 +CONFIGURE_ARGS += --with-jdk=$(JDK) CONFIGURE_ARGS += --enable-javahl CONFIGURE_ARGS += --with-neon=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) @@ -95,18 +104,12 @@ # Tests take *forever* TEST_SCRIPTS = -EXTRA_LIB = $(prefix)/bdb44/lib $(SVNLIB) -EXTRA_LIB += $(prefix)/apache2/lib -EXTRA_INC = $(prefix)/bdb44/include -EXTRA_INC += $(prefix)/apache2/include - # Add libintl when linking EXTRA_LINKER_FLAGS += -lintl -liconv include gar/category.mk -#BINDING_LANGS = java perl python ruby -BINDING_LANGS = java perl python +BINDING_LANGS = java perl python ruby BINDING_TARGETS = $(foreach LANG,$(BINDING_LANGS),svn-$(LANG)) PI_DEPENDS = $(BINDING_TARGETS) @@ -118,6 +121,7 @@ post-configure-modulated: @(echo "~~~ Fixing Libtool ~~~") @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + @$(DOWNLOADDIR)/gccMake.sh $(WORKSRC) $(DONADA) copy-templates: @@ -137,7 +141,6 @@ $(WORKSRC)/subversion/bindings/swig/python/*.py @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py - @$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py $(DONADA) svn-perl: @@ -147,22 +150,20 @@ $(WORKSRC)/subversion/bindings/swig/perl/native/*.pm @$(BUILD_ENV) gmake -C $(WORKSRC) swig-pl @$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl - @$(TEST_ENV) gmake -C $(WORKSRC) check-swig-pl $(DONADA) svn-ruby: @echo " ==> Building Ruby bindings" @touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c - @$(BUILD_ENV) gmake -C $(WORKSRC) swig-rb - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-rb - @$(TEST_ENV) gmake -C $(WORKSRC) check-swig-rb + @$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb + @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb $(DONADA) svn-java: @echo " ==> Building Java bindings" - @$(BUILD_ENV) gmake -C $(WORKSRC) javahl - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl - @$(TEST_ENV) gmake -C $(WORKSRC) check-javahl + @touch $(WORKSRC)/subversion/bindings/javahl/native/*.c + @$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) javahl + @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-javahl $(DONADA) Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-03-11 17:40:00 UTC (rev 3716) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-03-11 17:41:57 UTC (rev 3717) @@ -1,8 +1,10 @@ -6f3701a0f2acf3fe53093491ba3d77ee download/subversion-1.5.5.tar.bz2 +3d1dabbbcacf262e3e0baa3de79220d7 download/subversion-1.5.6.tar.bz2 395ec6d1bfe07efadc1c0aa8816673fa download/CSWsvn.checkinstall 1e19681e6d988d35cfc6d708883ab7aa download/CSWap2svn.postinstall 586b9c9924c1547d44451a84d2aca702 download/CSWap2svn.preremove f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW 1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW -59ff30dc3a9abaa15b2bd4faa116ab3c download/fixme.sh -89b68eb851673a9a0ebe29cd0010f0ed download/subversion155.diff +41ec540885de7c34625768aa1fb9682b download/fixme.sh +a1983ac6084ab919be687906d0892c44 download/gccMake.sh +f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff +89b68eb851673a9a0ebe29cd0010f0ed download/subversion156.diff Modified: csw/mgar/pkg/subversion/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/subversion/trunk/files/fixme.sh 2009-03-11 17:40:00 UTC (rev 3716) +++ csw/mgar/pkg/subversion/trunk/files/fixme.sh 2009-03-11 17:41:57 UTC (rev 3717) @@ -1,36 +1,49 @@ #!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### -touch /tmp/mike-fixme - umask 0022 -PATH=/opt/csw/bin:/usr/bin:/sbin +PATH=/opt/csw/bin if [ $# -ne 1 ]; then - echo "USAGE: $(basename $0) WORKSRC" + gecho "USAGE: $(basename $0) WORKSRC" exit 1 fi BASEPATH=$1 ## Fix Makefiles for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \ + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") for file in ${LT_FILES}; do - LIB_NAME=$(ggrep dlname= ${file} | \ + LIB_NAME=$(ggrep 'dlname=' ${file} | \ gsed -e "s/.*'\(.*\)'/\1/" \ -e "s/^lib//" \ -e "s/\.so.*$//") - fixpath=$(echo $file |gsed 's/\//\\\//g') - sed "s/${fixpath}/-l${LIB_NAME}/g" \ - ${mk} >Makefile.new - mv Makefile.new ${mk} + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} done done -## Fix libtool +## Fix libtool Script for lt in $(gfind ${BASEPATH} -name libtool -print); do gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - mv ${lt}.new ${lt} + gmv ${lt}.new ${lt} done +LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +if [ -f ${LTMAIN} ]; then + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} +fi + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 11 18:43:06 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 11 Mar 2009 17:43:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3718] csw/mgar/pkg/subversion/trunk/files Message-ID: Revision: 3718 http://gar.svn.sourceforge.net/gar/?rev=3718&view=rev Author: valholla Date: 2009-03-11 17:43:06 +0000 (Wed, 11 Mar 2009) Log Message: ----------- missed some new files Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/gccMake.sh csw/mgar/pkg/subversion/trunk/files/subversion156.diff Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/subversion155.diff Added: csw/mgar/pkg/subversion/trunk/files/gccMake.sh =================================================================== --- csw/mgar/pkg/subversion/trunk/files/gccMake.sh (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/gccMake.sh 2009-03-11 17:43:06 UTC (rev 3718) @@ -0,0 +1,24 @@ +#!/opt/csw/bin/bash + +PATH=/opt/csw/bin +WORKSRC=$1 + +gcp $WORKSRC/Makefile $WORKSRC/Makefile.gcc +gcp $WORKSRC/libtool $WORKSRC/libtool.gcc + + +perl -i -pnle 's|^(LIBTOOL.*)/libtool$|$1/libtool.gcc|' \ + $WORKSRC/Makefile.gcc +perl -i -pnle 's/-xO3\s*//' $WORKSRC/*.gcc +perl -i -pnle 's/-xarch=v8\s*//' $WORKSRC/*.gcc +perl -i -pnle 's/-mt\|*\s*//' $WORKSRC/*.gcc +perl -i -pnle 's/-KPIC/-fPIC/' $WORKSRC/*.gcc +perl -i -pnle 's/.*CC=.*cc"/LTCC=\/opt\/csw\/gcc4\/bin\/gcc/' \ + $WORKSRC/libtool.gcc +perl -i -pnle 's/.*CC=.*CC"/LTCC=\/opt\/csw\/gcc4\/bin\/g\+\+/' \ + $WORKSRC/libtool.gcc +perl -i -pnle 's/CC =.*$/CC = \/opt\/csw\/gcc4\/bin\/gcc/' \ + $WORKSRC/Makefile.gcc +perl -i -pnle 's/CXX =.*$/CXX = \/opt\/csw\/gcc4\/bin\/g\+\+/' \ + $WORKSRC/Makefile.gcc + Property changes on: csw/mgar/pkg/subversion/trunk/files/gccMake.sh ___________________________________________________________________ Added: svn:executable + * Deleted: csw/mgar/pkg/subversion/trunk/files/subversion155.diff =================================================================== --- csw/mgar/pkg/subversion/trunk/files/subversion155.diff 2009-03-11 17:41:57 UTC (rev 3717) +++ csw/mgar/pkg/subversion/trunk/files/subversion155.diff 2009-03-11 17:43:06 UTC (rev 3718) @@ -1,53 +0,0 @@ ---- subversion-1.5.5/Makefile.in.orig 2008-08-26 12:27:56.000000000 -0500 -+++ subversion-1.5.5/Makefile.in 2009-02-21 17:26:25.849467074 -0600 -@@ -46,6 +46,7 @@ - SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ - - LIBS = @LIBS@ -+JAVAHL_LIBS = @LIBS@ -lCrun -lCstd - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -68,15 +69,15 @@ - swig_rb_libdir = @libdir@ - - ### these possibly need further discussion --swig_pydir = @libdir@/svn-python/libsvn --swig_pydir_extra = @libdir@/svn-python/svn --swig_pldir = @libdir@/svn-perl -+swig_pydir = @prefix@/lib/python/site-packages/libsvn -+swig_pydir_extra = @prefix@/lib/python/site-packages/svn -+#swig_pldir = @libdir@/svn-perl - swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext - contribdir = @bindir@/svn-contrib - toolsdir = @bindir@/svn-tools - --javahl_javadir = @libdir@/svn-javahl --javahl_javahdir = @libdir@/svn-javahl/include -+javahl_javadir = @libdir@ -+javahl_javahdir = @libdir@/include - javahl_libdir = @libdir@ - javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work - ---- subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py.orig 2009-02-21 17:00:06.832094681 -0600 -+++ subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py 2009-02-21 16:59:46.198583440 -0600 -@@ -97,7 +97,7 @@ - - # use an array for the command to avoid the shell and potential - # security exposures -- cmd = ["diff"] \ -+ cmd = ["gdiff"] \ - + self.diffoptions \ - + [self.tempfile1, self.tempfile2] - ---- subversion-1.5.5/build-outputs.mk.orig 2009-02-21 20:49:58.653938743 -0600 -+++ subversion-1.5.5/build-outputs.mk 2009-02-21 20:51:14.193027135 -0600 -@@ -305,7 +305,7 @@ - libsvnjavahl_DEPS = $(javahl_javah_DEPS) $(javahl_java_DEPS) subversion/bindings/javahl/native/BlameCallback.lo subversion/bindings/javahl/native/ChangelistCallback.lo subversion/bindings/javahl/native/CommitMessage.lo subversion/bindings/javahl/native/ConflictResolverCallback.lo subversion/bindings/javahl/native/CopySources.lo subversion/bindings/javahl/native/DiffSummaryReceiver.lo subversion/bindings/javahl/native/EnumMapper.lo subversion/bindings/javahl/native/InfoCallback.lo subversion/bindings/javahl/native/Inputer.lo subversion/bindings/javahl/native/JNIByteArray.lo subversion/bindings/javahl/native/JNICriticalSection.lo subversion/bindings/javahl/native/JNIMutex.lo subversion/bindings/javahl/native/JNIStackElement.lo subversion/bindings/javahl/native/JNIStringHolder.lo subversion/bindings/javahl/native/JNIThreadData.lo subversion/bindings/javahl/native/JNIUtil.lo subversion/bindings/javahl/native/ListCallback.lo subversion/bindings/javahl/native/LogMessageCallback.l o subversion/bindings/javahl/native/MessageReceiver.lo subversion/bindings/javahl/native/Notify.lo subversion/bindings/javahl/native/Notify2.lo subversion/bindings/javahl/native/Outputer.lo subversion/bindings/javahl/native/Path.lo subversion/bindings/javahl/native/Pool.lo subversion/bindings/javahl/native/ProgressListener.lo subversion/bindings/javahl/native/Prompter.lo subversion/bindings/javahl/native/ProplistCallback.lo subversion/bindings/javahl/native/Revision.lo subversion/bindings/javahl/native/RevisionRange.lo subversion/bindings/javahl/native/RevpropTable.lo subversion/bindings/javahl/native/SVNAdmin.lo subversion/bindings/javahl/native/SVNBase.lo subversion/bindings/javahl/native/SVNClient.lo subversion/bindings/javahl/native/StatusCallback.lo subversion/bindings/javahl/native/StringArray.lo subversion/bindings/javahl/native/Targets.lo subversion/bindings/javahl/native/libsvnjavahl.la.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResource s.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la - libsvnjavahl_OBJECTS = BlameCallback.lo ChangelistCallback.lo CommitMessage.lo ConflictResolverCallback.lo CopySources.lo DiffSummaryReceiver.lo EnumMapper.lo InfoCallback.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo ListCallback.lo LogMessageCallback.lo MessageReceiver.lo Notify.lo Notify2.lo Outputer.lo Path.lo Pool.lo ProgressListener.lo Prompter.lo ProplistCallback.lo Revision.lo RevisionRange.lo RevpropTable.lo SVNAdmin.lo SVNBase.lo SVNClient.lo StatusCallback.lo StringArray.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_NativeResources.lo org_tigris_subversion_javahl_Path.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo org_tigris_subversion_javahl_Version.lo - subversion/bindings/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS) -- cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) -+ cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(JAVAHL_LIBS) - - locale_PATH = subversion/po - locale_DEPS = subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo Added: csw/mgar/pkg/subversion/trunk/files/subversion156.diff =================================================================== --- csw/mgar/pkg/subversion/trunk/files/subversion156.diff (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/subversion156.diff 2009-03-11 17:43:06 UTC (rev 3718) @@ -0,0 +1,53 @@ +--- subversion-1.5.5/Makefile.in.orig 2008-08-26 12:27:56.000000000 -0500 ++++ subversion-1.5.5/Makefile.in 2009-02-21 17:26:25.849467074 -0600 +@@ -46,6 +46,7 @@ + SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ + + LIBS = @LIBS@ ++JAVAHL_LIBS = @LIBS@ -lCrun -lCstd + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +@@ -68,15 +69,15 @@ + swig_rb_libdir = @libdir@ + + ### these possibly need further discussion +-swig_pydir = @libdir@/svn-python/libsvn +-swig_pydir_extra = @libdir@/svn-python/svn +-swig_pldir = @libdir@/svn-perl ++swig_pydir = @prefix@/lib/python/site-packages/libsvn ++swig_pydir_extra = @prefix@/lib/python/site-packages/svn ++#swig_pldir = @libdir@/svn-perl + swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext + contribdir = @bindir@/svn-contrib + toolsdir = @bindir@/svn-tools + +-javahl_javadir = @libdir@/svn-javahl +-javahl_javahdir = @libdir@/svn-javahl/include ++javahl_javadir = @libdir@ ++javahl_javahdir = @libdir@/include + javahl_libdir = @libdir@ + javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work + +--- subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py.orig 2009-02-21 17:00:06.832094681 -0600 ++++ subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py 2009-02-21 16:59:46.198583440 -0600 +@@ -97,7 +97,7 @@ + + # use an array for the command to avoid the shell and potential + # security exposures +- cmd = ["diff"] \ ++ cmd = ["gdiff"] \ + + self.diffoptions \ + + [self.tempfile1, self.tempfile2] + +--- subversion-1.5.5/build-outputs.mk.orig 2009-02-21 20:49:58.653938743 -0600 ++++ subversion-1.5.5/build-outputs.mk 2009-02-21 20:51:14.193027135 -0600 +@@ -305,7 +305,7 @@ + libsvnjavahl_DEPS = $(javahl_javah_DEPS) $(javahl_java_DEPS) subversion/bindings/javahl/native/BlameCallback.lo subversion/bindings/javahl/native/ChangelistCallback.lo subversion/bindings/javahl/native/CommitMessage.lo subversion/bindings/javahl/native/ConflictResolverCallback.lo subversion/bindings/javahl/native/CopySources.lo subversion/bindings/javahl/native/DiffSummaryReceiver.lo subversion/bindings/javahl/native/EnumMapper.lo subversion/bindings/javahl/native/InfoCallback.lo subversion/bindings/javahl/native/Inputer.lo subversion/bindings/javahl/native/JNIByteArray.lo subversion/bindings/javahl/native/JNICriticalSection.lo subversion/bindings/javahl/native/JNIMutex.lo subversion/bindings/javahl/native/JNIStackElement.lo subversion/bindings/javahl/native/JNIStringHolder.lo subversion/bindings/javahl/native/JNIThreadData.lo subversion/bindings/javahl/native/JNIUtil.lo subversion/bindings/javahl/native/ListCallback.lo subversion/bindings/javahl/native/LogMessageCallback.l o subversion/bindings/javahl/native/MessageReceiver.lo subversion/bindings/javahl/native/Notify.lo subversion/bindings/javahl/native/Notify2.lo subversion/bindings/javahl/native/Outputer.lo subversion/bindings/javahl/native/Path.lo subversion/bindings/javahl/native/Pool.lo subversion/bindings/javahl/native/ProgressListener.lo subversion/bindings/javahl/native/Prompter.lo subversion/bindings/javahl/native/ProplistCallback.lo subversion/bindings/javahl/native/Revision.lo subversion/bindings/javahl/native/RevisionRange.lo subversion/bindings/javahl/native/RevpropTable.lo subversion/bindings/javahl/native/SVNAdmin.lo subversion/bindings/javahl/native/SVNBase.lo subversion/bindings/javahl/native/SVNClient.lo subversion/bindings/javahl/native/StatusCallback.lo subversion/bindings/javahl/native/StringArray.lo subversion/bindings/javahl/native/Targets.lo subversion/bindings/javahl/native/libsvnjavahl.la.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResource s.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la + libsvnjavahl_OBJECTS = BlameCallback.lo ChangelistCallback.lo CommitMessage.lo ConflictResolverCallback.lo CopySources.lo DiffSummaryReceiver.lo EnumMapper.lo InfoCallback.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo ListCallback.lo LogMessageCallback.lo MessageReceiver.lo Notify.lo Notify2.lo Outputer.lo Path.lo Pool.lo ProgressListener.lo Prompter.lo ProplistCallback.lo Revision.lo RevisionRange.lo RevpropTable.lo SVNAdmin.lo SVNBase.lo SVNClient.lo StatusCallback.lo StringArray.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_NativeResources.lo org_tigris_subversion_javahl_Path.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo org_tigris_subversion_javahl_Version.lo + subversion/bindings/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS) +- cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) ++ cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(JAVAHL_LIBS) + + locale_PATH = subversion/po + locale_DEPS = subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Mar 11 18:58:59 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 11 Mar 2009 17:58:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[3719] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 3719 http://gar.svn.sourceforge.net/gar/?rev=3719&view=rev Author: j_arndt Date: 2009-03-11 17:58:59 +0000 (Wed, 11 Mar 2009) Log Message: ----------- nagios: removed prototype filter because of static prototype file, changed FMRI from network to application, file cleanup Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums Added Paths: ----------- csw/mgar/pkg/nagios/trunk/files/cswnagios Removed Paths: ------------- csw/mgar/pkg/nagios/trunk/files/CSWnagios.depend csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall csw/mgar/pkg/nagios/trunk/files/doc.diff csw/mgar/pkg/nagios/trunk/files/webconf.diff Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-03-11 17:43:06 UTC (rev 3718) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-03-11 17:58:59 UTC (rev 3719) @@ -26,8 +26,6 @@ SPKG_CLASSES = none cswinitsmf -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnagios$$$$/ { $$$$2 = "cswinitsmf" } { print }' - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --prefix=/opt/csw/nagios CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-03-11 17:43:06 UTC (rev 3718) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-03-11 17:58:59 UTC (rev 3719) @@ -4,7 +4,7 @@ 47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove 92467193beb7d39c7a56a520731cfb5c download/CSWnagios.prototype -eee3268b11eb94d797f0f606d53cfb97 download/cswnagios +d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios 0ef601e30d01a511822dd27df6b0e531 download/patch.diff 4faa5ec86586be23dfbbd9165f50046d download/configure.diff f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff Deleted: csw/mgar/pkg/nagios/trunk/files/CSWnagios.depend =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.depend 2009-03-11 17:43:06 UTC (rev 3718) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.depend 2009-03-11 17:58:59 UTC (rev 3719) @@ -1,14 +0,0 @@ -P CSWapache apache - apache webserver with mod_ssl included -P CSWgd gd - libgd, Graphics creation library and utilities -P CSWggettext ggettext - GNU gettext -P CSWglib2 glib2 - The low-level core lib for GNOME and GTK+ -P CSWiconv libiconv - GNU iconv library -P CSWjpeg jpeg - JPEG library and tools by the Independent JPEG Group -P CSWlibtool libtool - Generic library support script -P CSWlibtoolrt libtool_rt - Generic library support runtime libraries -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWperl perl - A high-level, general-purpose programming language. -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWzlib zlib - Zlib Data Compression Library -P CSWnagiosp nagiosp - Plugins for Nagios -P CSWnrpeplugin nrpeplugin - plugin for checking nrpe daemons Deleted: csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall 2009-03-11 17:43:06 UTC (rev 3718) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall 2009-03-11 17:58:59 UTC (rev 3719) @@ -1,99 +0,0 @@ -# postinstall for nagios package -# 2007-01-19 Add csw.conf support -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# - -# daemons are started by default -enable_daemon=yes - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_nagios" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_nagios" ] ; then - enable_daemon=no -fi - -# Set variable for the availability of SMF -smf=no -if [ -f /usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm ] - then - smf=yes -fi - -# Stop nagios if it is running -if pgrep nagios >/dev/null 2>&1 ; then - echo "## Stopping nagios" - if [ $smf = yes ]; then - /usr/sbin/svcadm disable svc:/application/cswnagios >/dev/null 2>&1 - else - /etc/init.d/cswnagios stop >/dev/null 2>&1 - fi - while pgrep nagios > /dev/null - do - sleep 1 - done -fi - -if [ $smf = yes ]; then - # Register with SMF - echo "Configuring service in SMF" - /usr/sbin/svccfg import /opt/csw/var/svc/manifest/application/nagios.xml >/dev/null 2>&1 - /usr/sbin/svcadm disable svc:application/cswnagios >/dev/null 2>&1 - echo "nagios is using Service Management Facility. The FMRI is:" - echo " svc:/application/cswnagios:default" -fi - -# Start nagios -if [ "$enable_daemon" = "yes" ] ; then - if [ -f $BASEDIR/opt/csw/nagios/etc/nagios.cfg ]; then - echo "## Starting nagios" - if [ $smf = yes ]; then - /usr/sbin/svcadm enable svc:/application/cswnagios >/dev/null 2>&1 - else - /etc/init.d/cswnagios start >/dev/null 2>&1 - fi - else - echo "## Not starting nagios - configuration file not found" - if [ $smf = yes ] ; then - /usr/sbin/svcadm disable svc:/application/cswnagios >/dev/null 2>&1 - fi - fi -fi - -# -PREFIX=/opt/csw/nagios -NAGHTTPD=httpd-nagios.conf - -if [ -d /opt/csw/apache/conf ]; then - APACHE_CONF=/opt/csw/apache/conf - cp $PREFIX/etc/$NAGHTTPD $APACHE_CONF -elif [ -d /etc/apache ]; then - APACHE_CONF=/etc/apache - cp $PREFIX/etc/$NAGHTTPD $APACHE_CONF -else - APACHE_CONF=$PREFIX/etc -fi - -cat < +# - setup for autoconf +# - add reload function +# 1999-08-06 Ethan Galstad +# - Added configuration info for use with RedHat's chkconfig tool +# per Fran Boon's suggestion +# 1999-08-13 Jim Popovitch +# - added variable for nagios/var directory +# - cd into nagios/var directory before creating tmp files on startup +# 1999-08-16 Ethan Galstad +# - Added test for rc.d directory as suggested by Karl DeBisschop +# 2000-07-23 Karl DeBisschop +# - Clean out redhat macros and other dependencies +# +# Description: Starts and stops the Nagios monitor +# used to provide network services status. +# +# Modified for CSW by Alex Moore 2006-02-27 +# Modified for OpenCSW by Juergen Arndt 2009-03-11 + +#FMRI application # FMRI path for service, see http://wiki.opencsw.org/cswclassutils-package#toc0 + +status_nagios () +{ + + if test ! -f $NagiosRun; then + echo "No lock file found in $NagiosRun" + return 1 + fi + + NagiosPID=`head -n 1 $NagiosRun` + if test -x $NagiosCGI/daemonchk.cgi; then + if $NagiosCGI/daemonchk.cgi -l $NagiosRun; then + return 0 + else + return 1 + fi + else + if ps -p $NagiosPID; then + return 0 + else + return 1 + fi + fi + + return 1 +} + + +killproc_nagios () +{ + + if [ ! -f $NagiosRun ]; then + echo "No lock file found in $NagiosRun" + return 1 + fi + + NagiosPID=`head -n 1 $NagiosRun` + kill $2 $NagiosPID +} + + +# Source function library +# Solaris doesn't have an rc.d directory, so do a test first +if [ -f /etc/rc.d/init.d/functions ]; then + . /etc/rc.d/init.d/functions +elif [ -f /etc/init.d/functions ]; then + . /etc/init.d/functions +fi + +prefix=/opt/csw/nagios +exec_prefix=${prefix} +NagiosBin=${exec_prefix}/bin/nagios +NagiosCfg=${prefix}/etc/nagios.cfg +NagiosLog=${prefix}/var/status.log +NagiosTmp=${prefix}/var/nagios.tmp +NagiosSav=${prefix}/var/status.sav +NagiosCmd=${prefix}/var/rw/nagios.cmd +NagiosVar=${prefix}/var +NagiosRun=${prefix}/var/nagios.lock +NagiosLckDir=/var/lock/subsys +NagiosLckFile=nagios +NagiosCGI=${exec_prefix}/sbin +Nagios=nagios + + +# Check that nagios exists. +test -f $NagiosBin || exit 0 + +# Check that nagios.cfg exists. +test -f $NagiosCfg || exit 0 + +# See how we were called. +case "$1" in + + start) + echo "Starting network monitor: nagios" + su - $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav" + rm -f $NagiosCmd + $NagiosBin -d $NagiosCfg + if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi + sleep 1 + status_nagios nagios + ;; + + stop) + echo "Stopping network monitor: nagios" + killproc_nagios nagios + rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosLckDir/$NagiosLckFile $NagiosCmd + ;; + + status) + status_nagios nagios + ;; + + restart) + printf "Running configuration check..." + $NagiosBin -v $NagiosCfg > /dev/null 2>&1; + if [ $? -eq 0 ]; then + echo "done" + $0 stop + $0 start + else + $NagiosBin -v $NagiosCfg + echo "failed - aborting restart." + exit 1 + fi + ;; + + reload|force-reload) + printf "Running configuration check..." + $NagiosBin -v $NagiosCfg > /dev/null 2>&1; + if [ $? -eq 0 ]; then + echo "done" + if test ! -f $NagiosRun; then + $0 start + else + NagiosPID=`head -n 1 $NagiosRun` + if status_nagios > /dev/null; then + printf "Reloading nagios configuration..." + killproc_nagios nagios -HUP + echo "done" + else + $0 stop + $0 start + fi + fi + else + $NagiosBin -v $NagiosCfg + echo "failed - aborting reload." + exit 1 + fi + ;; + + *) + echo "Usage: nagios {start|stop|restart|reload|force-reload|status}" + exit 1 + ;; + +esac + +# End of this script Deleted: csw/mgar/pkg/nagios/trunk/files/doc.diff =================================================================== --- csw/mgar/pkg/nagios/trunk/files/doc.diff 2009-03-11 17:43:06 UTC (rev 3718) +++ csw/mgar/pkg/nagios/trunk/files/doc.diff 2009-03-11 17:58:59 UTC (rev 3719) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru nagios-3.0.6.orig/Makefile.in nagios-3.0.6/Makefile.in ---- nagios-3.0.6.orig/Makefile.in 2008-12-25 14:35:24.040581755 +0100 -+++ nagios-3.0.6/Makefile.in 2008-12-25 14:31:46.669473752 +0100 -@@ -28,6 +28,7 @@ - CGIDIR=@sbindir@ - LIBEXECDIR=@libexecdir@ - HTMLDIR=@datadir@ -+DOCDIR=$(prefix)/../share/doc/nagios - INSTALL=@INSTALL@ - INSTALL_OPTS= - COMMAND_OPTS= -@@ -268,6 +269,12 @@ - @echo "*** External command directory configured ***" - @echo "" - -+install-docs: -+ $(INSTALL) -m 755 -d $(INSTALL_OPTS) -d $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 664 $(INSTALL_OPTS) ./Changelog $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 664 $(INSTALL_OPTS) ./INSTALLING $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 664 $(INSTALL_OPTS) ./README $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 664 $(INSTALL_OPTS) ./UPGRADING $(DESTDIR)$(DOCDIR) - - fullinstall: install install-init install-commandmode install-webconf - Deleted: csw/mgar/pkg/nagios/trunk/files/webconf.diff =================================================================== --- csw/mgar/pkg/nagios/trunk/files/webconf.diff 2009-03-11 17:43:06 UTC (rev 3718) +++ csw/mgar/pkg/nagios/trunk/files/webconf.diff 2009-03-11 17:58:59 UTC (rev 3719) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru nagios-3.0.6.orig/Makefile.in nagios-3.0.6/Makefile.in ---- nagios-3.0.6.orig/Makefile.in 2008-12-19 08:48:37.252900900 +0100 -+++ nagios-3.0.6/Makefile.in 2008-12-19 08:48:20.644359694 +0100 -@@ -243,7 +243,7 @@ - @echo "" - - install-webconf: -- $(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf -+ $(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/httpd-nagios.conf - - @echo "" - @echo "*** Nagios/Apache conf file installed ***" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 11 21:43:31 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 11 Mar 2009 20:43:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3720] csw/mgar/pkg/distcc/trunk/Makefile Message-ID: Revision: 3720 http://gar.svn.sourceforge.net/gar/?rev=3720&view=rev Author: hson Date: 2009-03-11 20:43:31 +0000 (Wed, 11 Mar 2009) Log Message: ----------- distcc: Add dependency Modified Paths: -------------- csw/mgar/pkg/distcc/trunk/Makefile Modified: csw/mgar/pkg/distcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/distcc/trunk/Makefile 2009-03-11 17:58:59 UTC (rev 3719) +++ csw/mgar/pkg/distcc/trunk/Makefile 2009-03-11 20:43:31 UTC (rev 3720) @@ -20,7 +20,7 @@ SPKG_SOURCEURL = http://distcc.googlecode.com/ -REQUIRED_PKGS += CSWlibpopt +REQUIRED_PKGS += CSWlibpopt CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 12 02:58:37 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 12 Mar 2009 01:58:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3721] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 3721 http://gar.svn.sourceforge.net/gar/?rev=3721&view=rev Author: hson Date: 2009-03-12 01:58:37 +0000 (Thu, 12 Mar 2009) Log Message: ----------- librsvg: Makefile cleanup Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-03-11 20:43:31 UTC (rev 3720) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-03-12 01:58:37 UTC (rev 3721) @@ -19,8 +19,6 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).$(GARSUBREV).tar.bz2 -DISTFILES += librsvg-2.so.2.15.90.i -DISTFILES += librsvg-2.so.2.15.90.s DISTNAME = $(GARNAME)-$(GARVERSION).$(GARSUBREV) @@ -37,10 +35,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - # Upstream develops on gcc only PATCHFILES = pdiff.patch PATCHFILES += perceptualdiff.patch @@ -56,7 +50,6 @@ include gar/category.mk - post-install-isa-sparcv8: @cp $(FILEDIR)/librsvg-2.so.2.15.90.s $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Mar 12 05:17:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 12 Mar 2009 04:17:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3722] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 3722 http://gar.svn.sourceforge.net/gar/?rev=3722&view=rev Author: valholla Date: 2009-03-12 04:17:20 +0000 (Thu, 12 Mar 2009) Log Message: ----------- working copy Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums csw/mgar/pkg/subversion/trunk/files/subversion156.diff Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/gccMake.sh Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-03-12 01:58:37 UTC (rev 3721) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-03-12 04:17:20 UTC (rev 3722) @@ -29,7 +29,6 @@ PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn -PACKAGES += CSWpysvn CSWjavasvn SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion @@ -44,7 +43,7 @@ REQUIRED_PKGS_CSWap2svn = CSWsvn SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn -REQUIRED_PKGS_CSWjavasvn = CSWsvn +REQUIRED_PKGS_CSWjavasvn = CSWsvn CSWgcc3g++rt CSWgcc3corert SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pmsvn REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl @@ -53,24 +52,25 @@ REQUIRED_PKGS_CSWpysvn = CSWsvn CSWpython SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn -REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby +REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby CSWgcc3g++rt CSWgcc3corert PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWap2svn = $(prefix)/apache2* -PKGFILES_CSWjavasvn = $(SVNLIB)/*java* -PKGFILES_CSWpmsvn = $(libdir)/perl* -PKGFILES_CSWpmsvn += $(SVNLIB)/*perl* -PKGFILES_CSWpmsvn += $(mandir)/*swig_perl* -PKGFILES_CSWpysvn = $(libdir)/python* -PKGFILES_CSWpysvn += $(SVNLIB)/*swig_py* -PKGFILES_CSWrbsvn = $(libdir)/ruby* -PKGFILES_CSWrbsvn += $(SVNLIB)/*swig_ruby* +PKGFILES_CSWap2svn = $(prefix)/apache2.* +PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* +PKGFILES_CSWpmsvn = $(libdir)/perl.* +PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* +PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* +PKGFILES_CSWpysvn = $(libdir)/python.* +PKGFILES_CSWpysvn += $(SVNLIB)/.*swig_py.* +PKGFILES_CSWrbsvn = $(libdir)/ruby.* +PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW DISTFILES += fixme.sh -DISTFILES += gccMake.sh +DISTFILES += sparc-gcc.diff +DISTFILES += i386-gcc.diff # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html @@ -83,11 +83,10 @@ NODIRPATHS = --libdir --libexecdir JDK = /usr/jdk1.5.0_15 EXTRA_INC += $(JDK)/include - SVNLIB = $(prefix)/lib/svn CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) -CONFIGURE_ARGS += --with-gnu-ld=/opt/csw/bin/gld +CONFIGURE_ARGS += --with-gnu-ld=yes CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs @@ -98,12 +97,15 @@ CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-sasl=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) +CONFIGURE_ARGS += --disable-static TEST_TARGET = check - # Tests take *forever* -TEST_SCRIPTS = +TEST_SCRIPTS = skip +test-skip: + @$(DONADA) + # Add libintl when linking EXTRA_LINKER_FLAGS += -lintl -liconv @@ -114,6 +116,7 @@ PI_DEPENDS = $(BINDING_TARGETS) PI_DEPENDS += copy-templates +PI_DEPENDS += fix-install post-install-modulated: $(PI_DEPENDS) $(DONADA) @@ -121,9 +124,14 @@ post-configure-modulated: @(echo "~~~ Fixing Libtool ~~~") @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @$(DOWNLOADDIR)/gccMake.sh $(WORKSRC) + @(gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc) + @(gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc) + @(gpatch -d $(WORKSRC) -p0 -F2 < $(DOWNLOADDIR)/$(GARCH)-gcc.diff) $(DONADA) +fix-install: + @(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8) + copy-templates: ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 \ @@ -140,6 +148,7 @@ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py + #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py $(DONADA) @@ -149,6 +158,7 @@ $(WORKSRC)/subversion/bindings/swig/perl/native/*.c \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.pm @$(BUILD_ENV) gmake -C $(WORKSRC) swig-pl + #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-pl @$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl $(DONADA) @@ -156,13 +166,16 @@ @echo " ==> Building Ruby bindings" @touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c @$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb + #@$(TEST_ENV) gmake -f Makefile.gcc -C $(WORKSRC) check-swig-rb @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb $(DONADA) +## The test can only be run "after" you have it installed. svn-java: @echo " ==> Building Java bindings" @touch $(WORKSRC)/subversion/bindings/javahl/native/*.c @$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) javahl + #@$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) check-javahl @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-javahl $(DONADA) Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-03-12 01:58:37 UTC (rev 3721) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-03-12 04:17:20 UTC (rev 3722) @@ -5,6 +5,7 @@ f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW 1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW 41ec540885de7c34625768aa1fb9682b download/fixme.sh -a1983ac6084ab919be687906d0892c44 download/gccMake.sh +91d4c5a963192f113602b1bd1917d0cb download/sparc-gcc.diff +6caa3c518b84c2b3f6a33b61d1b022e3 download/i386-gcc.diff f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff -89b68eb851673a9a0ebe29cd0010f0ed download/subversion156.diff +f7d05c59656dcf01fb844295c9912f78 download/subversion156.diff Deleted: csw/mgar/pkg/subversion/trunk/files/gccMake.sh =================================================================== --- csw/mgar/pkg/subversion/trunk/files/gccMake.sh 2009-03-12 01:58:37 UTC (rev 3721) +++ csw/mgar/pkg/subversion/trunk/files/gccMake.sh 2009-03-12 04:17:20 UTC (rev 3722) @@ -1,24 +0,0 @@ -#!/opt/csw/bin/bash - -PATH=/opt/csw/bin -WORKSRC=$1 - -gcp $WORKSRC/Makefile $WORKSRC/Makefile.gcc -gcp $WORKSRC/libtool $WORKSRC/libtool.gcc - - -perl -i -pnle 's|^(LIBTOOL.*)/libtool$|$1/libtool.gcc|' \ - $WORKSRC/Makefile.gcc -perl -i -pnle 's/-xO3\s*//' $WORKSRC/*.gcc -perl -i -pnle 's/-xarch=v8\s*//' $WORKSRC/*.gcc -perl -i -pnle 's/-mt\|*\s*//' $WORKSRC/*.gcc -perl -i -pnle 's/-KPIC/-fPIC/' $WORKSRC/*.gcc -perl -i -pnle 's/.*CC=.*cc"/LTCC=\/opt\/csw\/gcc4\/bin\/gcc/' \ - $WORKSRC/libtool.gcc -perl -i -pnle 's/.*CC=.*CC"/LTCC=\/opt\/csw\/gcc4\/bin\/g\+\+/' \ - $WORKSRC/libtool.gcc -perl -i -pnle 's/CC =.*$/CC = \/opt\/csw\/gcc4\/bin\/gcc/' \ - $WORKSRC/Makefile.gcc -perl -i -pnle 's/CXX =.*$/CXX = \/opt\/csw\/gcc4\/bin\/g\+\+/' \ - $WORKSRC/Makefile.gcc - Added: csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff =================================================================== --- csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff 2009-03-12 04:17:20 UTC (rev 3722) @@ -0,0 +1,172 @@ +--- libtool.gcc.o 2009-03-11 21:48:23.343791369 -0500 ++++ libtool.gcc 2009-03-11 21:48:50.846784450 -0500 +@@ -82,13 +82,13 @@ + AR_FLAGS="cru" + + # A C compiler. +-LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" ++LTCC="/opt/csw/gcc3/bin/gcc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS" ++LTCFLAGS="-O2 -pipe -m32 -march=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS" + + # A language-specific compiler. +-CC="/opt/studio/SOS11/SUNWspro/bin/cc" ++CC="/opt/csw/gcc3/bin/gcc" + + # Is the compiler the GNU C compiler? + with_gcc= +@@ -143,7 +143,7 @@ + exeext="" + + # Additional compiler flags for building library objects. +-pic_flag=" -KPIC -DPIC" ++pic_flag=" -fPIC -DPIC" + pic_mode=default + + # What is the maximum length of a command? +@@ -1989,7 +1989,7 @@ + continue + ;; + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +@@ -2003,7 +2003,7 @@ + + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # -march=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC +@@ -2012,7 +2012,7 @@ + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -64|-mips[0-9]|-r[0-9][0-9]*|-march=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + + # Unknown arguments in both finalize_command and compile_command need +@@ -2484,7 +2484,7 @@ + lib= + found=no + case $deplib in +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" +@@ -7318,13 +7318,13 @@ + AR_FLAGS="cru" + + # A C compiler. +-LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" ++LTCC="/opt/csw/gcc3/bin/gcc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS" ++LTCFLAGS="-O2 -pipe -m32 -march=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS" + + # A language-specific compiler. +-CC="/opt/studio/SOS11/SUNWspro/bin/CC" ++CC="/opt/csw/gcc3/bin/g++" + + # Is the compiler the GNU C compiler? + with_gcc=no +@@ -7379,7 +7379,7 @@ + exeext="" + + # Additional compiler flags for building library objects. +-pic_flag=" -KPIC -DPIC" ++pic_flag=" -fPIC -DPIC" + pic_mode=default + + # What is the maximum length of a command? +@@ -7475,7 +7475,7 @@ + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdeps="-library=Cstd -library=Crun" ++postdeps="" + + # The library search path used internally by the compiler when linking + # a shared library. +@@ -7624,10 +7624,10 @@ + AR_FLAGS="cru" + + # A C compiler. +-LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" ++LTCC="/opt/csw/gcc3/bin/gcc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS" ++LTCFLAGS="-O2 -pipe -m32 -march=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS" + + # A language-specific compiler. + CC="f77" +@@ -7685,7 +7685,7 @@ + exeext="" + + # Additional compiler flags for building library objects. +-pic_flag=" -KPIC" ++pic_flag=" -fPIC" + pic_mode=default + + # What is the maximum length of a command? +--- Makefile.gcc.o 2009-03-11 21:48:17.524971502 -0500 ++++ Makefile.gcc 2009-03-11 21:49:06.704433498 -0500 +@@ -89,12 +89,12 @@ + PACKAGE_NAME=subversion + PACKAGE_VERSION=1.5.6 + +-CC = /opt/studio/SOS11/SUNWspro/bin/cc +-CXX = /opt/studio/SOS11/SUNWspro/bin/CC ++CC = /opt/csw/gcc3/bin/gc ++CXX = /opt/csw/gcc3/bin/g++ + EXEEXT = + + SHELL = /bin/bash +-LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-i386/subversion-1.5.6/libtool ++LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-i386/subversion-1.5.6/libtool.gcc + LTFLAGS = --tag=CC --silent + LTCXXFLAGS = --tag=CXX --silent + LT_LDFLAGS = +@@ -113,10 +113,10 @@ + + SWIG = none + SWIG_PY_INCLUDES = $(SWIG_INCLUDES) -I/opt/csw/include/python2.6 -I$(SWIG_SRC_DIR)/python/libsvn_swig_py +-SWIG_PY_COMPILE = /opt/studio/SOS11/SUNWspro/bin/cc -DNDEBUG -O -Kpic +-SWIG_PY_LINK = /opt/studio/SOS11/SUNWspro/bin/cc -G ++SWIG_PY_COMPILE = /opt/csw/gcc3/bin/gc -DNDEBUG -O -fpic ++SWIG_PY_LINK = /opt/csw/gcc3/bin/gc -G + SWIG_PY_LIBS = +-SWIG_PL_INCLUDES = $(SWIG_INCLUDES) -D_REENTRANT -xO3 -xtarget=generic -xarch=generic -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/csw/lib/perl/5.8.8/CORE ++SWIG_PL_INCLUDES = $(SWIG_INCLUDES) -D_REENTRANT -O2 -pipe -m32 -xtarget=generic -march=generic -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/csw/lib/perl/5.8.8/CORE + SWIG_RB_INCLUDES = $(SWIG_INCLUDES) -I. -I/opt/csw/lib/ruby/1.8/i386-solaris2.8 -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby + SWIG_RB_COMPILE = /opt/csw/gcc4/bin/gcc -mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include -fPIC + SWIG_RB_LINK = /opt/csw/gcc4/bin/gcc -shared -shrext .so +@@ -142,14 +142,14 @@ + MKDIR = /opt/csw/bin/ginstall -c -d + + # The EXTRA_ parameters can be used to pass extra flags at 'make' time. +-CFLAGS = -xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS) +-CXXFLAGS = -xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS) ++CFLAGS = -O2 -pipe -m32 -march=i386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS) ++CXXFLAGS = -O2 -pipe -m32 -march=i386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS) + ### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes, + ### -Wmissing-declarations) are not valid for C++, and should be somehow + ### suppressed (but they may come from httpd or APR). + CPPFLAGS = -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -I/opt/csw/bdb44/include -I/opt/csw/include -DSOLARIS2=8 -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_LARGEFILE64_SOURCE $(EXTRA_CPPFLAGS) +-LDFLAGS = -xarch=386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS) +-SWIG_LDFLAGS = -xarch=386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS) ++LDFLAGS = -march=i386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS) ++SWIG_LDFLAGS = -march=i386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS) + + COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) + COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) Added: csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff =================================================================== --- csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff 2009-03-12 04:17:20 UTC (rev 3722) @@ -0,0 +1,172 @@ +--- libtool.gcc.o 2009-03-11 21:45:55.799166272 -0500 ++++ libtool.gcc 2009-03-11 21:46:43.392646721 -0500 +@@ -82,13 +82,13 @@ + AR_FLAGS="cru" + + # A C compiler. +-LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" ++LTCC="/opt/csw/gcc3/bin/gcc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS" ++LTCFLAGS="-O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS" + + # A language-specific compiler. +-CC="/opt/studio/SOS11/SUNWspro/bin/cc" ++CC="/opt/csw/gcc3/bin/gcc" + + # Is the compiler the GNU C compiler? + with_gcc= +@@ -143,7 +143,7 @@ + exeext="" + + # Additional compiler flags for building library objects. +-pic_flag=" -KPIC -DPIC" ++pic_flag=" -fPIC -DPIC" + pic_mode=default + + # What is the maximum length of a command? +@@ -1989,7 +1989,7 @@ + continue + ;; + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +@@ -2003,7 +2003,7 @@ + + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # -mcpu=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC +@@ -2012,7 +2012,7 @@ + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -64|-mips[0-9]|-r[0-9][0-9]*|-mcpu=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + + # Unknown arguments in both finalize_command and compile_command need +@@ -2484,7 +2484,7 @@ + lib= + found=no + case $deplib in +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" +@@ -7318,13 +7318,13 @@ + AR_FLAGS="cru" + + # A C compiler. +-LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" ++LTCC="/opt/csw/gcc3/bin/gcc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS" ++LTCFLAGS="-O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS" + + # A language-specific compiler. +-CC="/opt/studio/SOS11/SUNWspro/bin/CC" ++CC="/opt/csw/gcc3/bin/gcc" + + # Is the compiler the GNU C compiler? + with_gcc=no +@@ -7379,7 +7379,7 @@ + exeext="" + + # Additional compiler flags for building library objects. +-pic_flag=" -KPIC -DPIC" ++pic_flag=" -fPIC -DPIC" + pic_mode=default + + # What is the maximum length of a command? +@@ -7475,7 +7475,7 @@ + + # Dependencies to place after the objects being linked to create a + # shared library. +-postdeps="-library=Cstd -library=Crun" ++postdeps="" + + # The library search path used internally by the compiler when linking + # a shared library. +@@ -7624,10 +7624,10 @@ + AR_FLAGS="cru" + + # A C compiler. +-LTCC="/opt/studio/SOS11/SUNWspro/bin/cc" ++LTCC="/opt/csw/gcc3/bin/gcc" + + # LTCC compiler flags. +-LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS" ++LTCFLAGS="-O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS" + + # A language-specific compiler. + CC="f77" +@@ -7685,7 +7685,7 @@ + exeext="" + + # Additional compiler flags for building library objects. +-pic_flag=" -KPIC" ++pic_flag=" -fPIC" + pic_mode=default + + # What is the maximum length of a command? +--- Makefile.gcc.o 2009-03-11 21:45:44.001600884 -0500 ++++ Makefile.gcc 2009-03-11 21:46:14.602732752 -0500 +@@ -89,12 +89,12 @@ + PACKAGE_NAME=subversion + PACKAGE_VERSION=1.5.6 + +-CC = /opt/studio/SOS11/SUNWspro/bin/cc +-CXX = /opt/studio/SOS11/SUNWspro/bin/CC ++CC = /opt/csw/gcc3/bin/gcc ++CXX = /opt/csw/gcc3/bin/g++ + EXEEXT = + + SHELL = /bin/bash +-LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-sparcv8/subversion-1.5.6/libtool ++LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-sparcv8/subversion-1.5.6/libtool.gcc + LTFLAGS = --tag=CC --silent + LTCXXFLAGS = --tag=CXX --silent + LT_LDFLAGS = +@@ -113,10 +113,10 @@ + + SWIG = none + SWIG_PY_INCLUDES = $(SWIG_INCLUDES) -I/opt/csw/include/python2.6 -I$(SWIG_SRC_DIR)/python/libsvn_swig_py +-SWIG_PY_COMPILE = /opt/studio/SOS11/SUNWspro/bin/cc -DNDEBUG -O -xO3 -xarch=v8 +-SWIG_PY_LINK = /opt/studio/SOS11/SUNWspro/bin/cc -G ++SWIG_PY_COMPILE = /opt/csw/gcc3/bin/gcc -DNDEBUG -O -O2 -pipe -mcpu=v8 ++SWIG_PY_LINK = /opt/csw/gcc3/bin/gcc -G + SWIG_PY_LIBS = +-SWIG_PL_INCLUDES = $(SWIG_INCLUDES) -D_REENTRANT -xO3 -xtarget=ultra -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/csw/lib/perl/5.8.8/CORE ++SWIG_PL_INCLUDES = $(SWIG_INCLUDES) -D_REENTRANT -O2 -pipe -xtarget=ultra -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/csw/lib/perl/5.8.8/CORE + SWIG_RB_INCLUDES = $(SWIG_INCLUDES) -I. -I/opt/csw/lib/ruby/1.8/sparc-solaris2.8 -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby + SWIG_RB_COMPILE = /opt/csw/gcc4/bin/gcc -O2 -pipe -mcpu=v8 -I/opt/csw/include -fPIC + SWIG_RB_LINK = /opt/csw/gcc4/bin/gcc -shared -shrext .so +@@ -142,14 +142,14 @@ + MKDIR = /opt/csw/bin/ginstall -c -d + + # The EXTRA_ parameters can be used to pass extra flags at 'make' time. +-CFLAGS = -xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -mt -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS) +-CXXFLAGS = -xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS) ++CFLAGS = -O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS) ++CXXFLAGS = -O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS) + ### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes, + ### -Wmissing-declarations) are not valid for C++, and should be somehow + ### suppressed (but they may come from httpd or APR). + CPPFLAGS = -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include -I/opt/csw/bdb44/include -I/opt/csw/include -DSOLARIS2=8 -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_LARGEFILE64_SOURCE $(EXTRA_CPPFLAGS) +-LDFLAGS = -xarch=v8 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS) +-SWIG_LDFLAGS = -xarch=v8 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS) ++LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS) ++SWIG_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS) + + COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) + COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) Modified: csw/mgar/pkg/subversion/trunk/files/subversion156.diff =================================================================== --- csw/mgar/pkg/subversion/trunk/files/subversion156.diff 2009-03-12 01:58:37 UTC (rev 3721) +++ csw/mgar/pkg/subversion/trunk/files/subversion156.diff 2009-03-12 04:17:20 UTC (rev 3722) @@ -1,13 +1,5 @@ --- subversion-1.5.5/Makefile.in.orig 2008-08-26 12:27:56.000000000 -0500 +++ subversion-1.5.5/Makefile.in 2009-02-21 17:26:25.849467074 -0600 -@@ -46,6 +46,7 @@ - SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ - - LIBS = @LIBS@ -+JAVAHL_LIBS = @LIBS@ -lCrun -lCstd - - prefix = @prefix@ - exec_prefix = @exec_prefix@ @@ -68,15 +69,15 @@ swig_rb_libdir = @libdir@ @@ -39,15 +31,3 @@ + cmd = ["gdiff"] \ + self.diffoptions \ + [self.tempfile1, self.tempfile2] - ---- subversion-1.5.5/build-outputs.mk.orig 2009-02-21 20:49:58.653938743 -0600 -+++ subversion-1.5.5/build-outputs.mk 2009-02-21 20:51:14.193027135 -0600 -@@ -305,7 +305,7 @@ - libsvnjavahl_DEPS = $(javahl_javah_DEPS) $(javahl_java_DEPS) subversion/bindings/javahl/native/BlameCallback.lo subversion/bindings/javahl/native/ChangelistCallback.lo subversion/bindings/javahl/native/CommitMessage.lo subversion/bindings/javahl/native/ConflictResolverCallback.lo subversion/bindings/javahl/native/CopySources.lo subversion/bindings/javahl/native/DiffSummaryReceiver.lo subversion/bindings/javahl/native/EnumMapper.lo subversion/bindings/javahl/native/InfoCallback.lo subversion/bindings/javahl/native/Inputer.lo subversion/bindings/javahl/native/JNIByteArray.lo subversion/bindings/javahl/native/JNICriticalSection.lo subversion/bindings/javahl/native/JNIMutex.lo subversion/bindings/javahl/native/JNIStackElement.lo subversion/bindings/javahl/native/JNIStringHolder.lo subversion/bindings/javahl/native/JNIThreadData.lo subversion/bindings/javahl/native/JNIUtil.lo subversion/bindings/javahl/native/ListCallback.lo subversion/bindings/javahl/native/LogMessageCallback.l o subversion/bindings/javahl/native/MessageReceiver.lo subversion/bindings/javahl/native/Notify.lo subversion/bindings/javahl/native/Notify2.lo subversion/bindings/javahl/native/Outputer.lo subversion/bindings/javahl/native/Path.lo subversion/bindings/javahl/native/Pool.lo subversion/bindings/javahl/native/ProgressListener.lo subversion/bindings/javahl/native/Prompter.lo subversion/bindings/javahl/native/ProplistCallback.lo subversion/bindings/javahl/native/Revision.lo subversion/bindings/javahl/native/RevisionRange.lo subversion/bindings/javahl/native/RevpropTable.lo subversion/bindings/javahl/native/SVNAdmin.lo subversion/bindings/javahl/native/SVNBase.lo subversion/bindings/javahl/native/SVNClient.lo subversion/bindings/javahl/native/StatusCallback.lo subversion/bindings/javahl/native/StringArray.lo subversion/bindings/javahl/native/Targets.lo subversion/bindings/javahl/native/libsvnjavahl.la.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResource s.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la - libsvnjavahl_OBJECTS = BlameCallback.lo ChangelistCallback.lo CommitMessage.lo ConflictResolverCallback.lo CopySources.lo DiffSummaryReceiver.lo EnumMapper.lo InfoCallback.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo ListCallback.lo LogMessageCallback.lo MessageReceiver.lo Notify.lo Notify2.lo Outputer.lo Path.lo Pool.lo ProgressListener.lo Prompter.lo ProplistCallback.lo Revision.lo RevisionRange.lo RevpropTable.lo SVNAdmin.lo SVNBase.lo SVNClient.lo StatusCallback.lo StringArray.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_NativeResources.lo org_tigris_subversion_javahl_Path.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo org_tigris_subversion_javahl_Version.lo - subversion/bindings/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS) -- cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) -+ cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(JAVAHL_LIBS) - - locale_PATH = subversion/po - locale_DEPS = subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Mar 12 10:50:44 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Mar 2009 09:50:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[3723] csw/mgar/pkg Message-ID: Revision: 3723 http://gar.svn.sourceforge.net/gar/?rev=3723&view=rev Author: bonivart Date: 2009-03-12 09:50:44 +0000 (Thu, 12 Mar 2009) Log Message: ----------- qpopper: move to gar, update to 4.0.16 Added Paths: ----------- csw/mgar/pkg/qpopper/ csw/mgar/pkg/qpopper/branches/ csw/mgar/pkg/qpopper/tags/ csw/mgar/pkg/qpopper/trunk/ csw/mgar/pkg/qpopper/trunk/Makefile csw/mgar/pkg/qpopper/trunk/checksums csw/mgar/pkg/qpopper/trunk/files/ csw/mgar/pkg/qpopper/trunk/files/README.CSW Property changes on: csw/mgar/pkg/qpopper/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/qpopper/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpopper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qpopper/trunk/Makefile 2009-03-12 09:50:44 UTC (rev 3723) @@ -0,0 +1,43 @@ +GARNAME = qpopper +GARVERSION = 4.0.16 +WORKSRC = $(WORKDIR)/$(GARNAME)$(GARVERSION) +CATEGORIES = apps + +DESCRIPTION = the most widely-used POP3 server for Unix +define BLURB + Qpopper supports the widely used POP3 protocol for downloading Internet + e-mail used by many popular e-mail clients. Qpopper does not include a + message transfer agent or SMTP support and normally works with standard + UNIX mail transfer agents such as sendmail or smail. +endef + +MASTER_SITES = ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ +DISTFILES = $(GARNAME)$(GARVERSION).tar.gz +DISTFILES += README.CSW + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWqpopper +CATALOGNAME_CSWqpopper = qpopper +SPKG_DESC_CSWqpopper = $(DESCRIPTION) + +SPKG_SOURCEURL = http://www.eudora.com/qpopper + +CONFIGURE_ARGS = $(DIRPATHS) + +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + @echo " ==> Install for $(GARNAME) (custom)" + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(sbindir) + @ginstall -d $(DESTDIR)$(mandir)/man8 + @( cd $(WORKSRC) ; \ + cp License.txt $(DESTDIR)$(docdir)/$(GARNAME)/license ; \ + cp popper/popper $(DESTDIR)$(sbindir) ; \ + cp man/* $(DESTDIR)$(mandir)/man8 ) + @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/qpopper/trunk/checksums =================================================================== --- csw/mgar/pkg/qpopper/trunk/checksums (rev 0) +++ csw/mgar/pkg/qpopper/trunk/checksums 2009-03-12 09:50:44 UTC (rev 3723) @@ -0,0 +1,2 @@ +1282219a4e315069b7c422b05d171fab download/qpopper4.0.16.tar.gz +26d16c0e628390b36a49fa459e252db8 download/README.CSW Added: csw/mgar/pkg/qpopper/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/qpopper/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/qpopper/trunk/files/README.CSW 2009-03-12 09:50:44 UTC (rev 3723) @@ -0,0 +1,28 @@ +README.CSW +========== + +Installation +------------ +1. Add two lines to /etc/inetd.conf: + +# qpopper pop3 server +pop3 stream tcp nowait root /opt/csw/sbin/popper popper -s + +2. Reload inetd: + +# pkill -HUP inetd + +3. Test with: + +# telnet localhost pop3 (pop3/110 should already be in /etc/services) +Trying 127.0.0.1... +Connected to localhost. +Escape character is '^]'. ++OK Qpopper (version 4.0.9) at yourhost starting. + + +Note for Solaris 10: you should run inetconv to convert the above to be +controlled by SMF. + + +bonivart/071009 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 14:09:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 13:09:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3724] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 3724 http://gar.svn.sourceforge.net/gar/?rev=3724&view=rev Author: dmichelsen Date: 2009-03-12 13:09:31 +0000 (Thu, 12 Mar 2009) Log Message: ----------- mGAR v2: Add check for gmake version Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-03-12 09:50:44 UTC (rev 3723) +++ csw/mgar/gar/v2/gar.mk 2009-03-12 13:09:31 UTC (rev 3724) @@ -21,6 +21,10 @@ #GARDIR := $(CURDIR)/../.. #endif +ifneq ($(abspath /),/) +$(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) +endif + GARDIR ?= gar GARBIN = $(GARDIR)/bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Mar 12 14:37:50 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 12 Mar 2009 13:37:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[3725] csw/mgar/pkg Message-ID: Revision: 3725 http://gar.svn.sourceforge.net/gar/?rev=3725&view=rev Author: bonivart Date: 2009-03-12 13:37:47 +0000 (Thu, 12 Mar 2009) Log Message: ----------- vispan: move to gar, not complete yet Added Paths: ----------- csw/mgar/pkg/Vispan/ csw/mgar/pkg/Vispan/branches/ csw/mgar/pkg/Vispan/tags/ csw/mgar/pkg/Vispan/trunk/ csw/mgar/pkg/Vispan/trunk/Makefile csw/mgar/pkg/Vispan/trunk/checksums csw/mgar/pkg/Vispan/trunk/files/ csw/mgar/pkg/Vispan/trunk/files/CSWvispan.gspec Property changes on: csw/mgar/pkg/Vispan/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/Vispan/trunk/Makefile =================================================================== --- csw/mgar/pkg/Vispan/trunk/Makefile (rev 0) +++ csw/mgar/pkg/Vispan/trunk/Makefile 2009-03-12 13:37:47 UTC (rev 3725) @@ -0,0 +1,22 @@ +GARNAME = Vispan +GARVERSION = 3.1.1 +CATEGORIES = cpan + +DESCRIPTION = VIrus and SPam ANalyser +define BLURB + Vispan is a PERL script which analyses the mail log file to produce useful + statistics. It requires MailScanner to provide the necessary log file entries. +endef + +MASTER_SITES = http://www.while.org.uk/component/option,com_docman/task,doc_download/gid,3/Itemid,6/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWvispan) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWpmgeoippureperl CSWpmnetcidr CSWpmnetdns CSWpmgd CSWpmgdgraph CSWpmnumberformat CSWpmmailsendmail + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/Vispan/trunk/checksums =================================================================== --- csw/mgar/pkg/Vispan/trunk/checksums (rev 0) +++ csw/mgar/pkg/Vispan/trunk/checksums 2009-03-12 13:37:47 UTC (rev 3725) @@ -0,0 +1,2 @@ +dcc95563c5dad72d18965d123618891f download/Vispan-3.1.1.tar.gz +0630d71bb417d0d3f3382e63a72439e3 download/CSWvispan.gspec Added: csw/mgar/pkg/Vispan/trunk/files/CSWvispan.gspec =================================================================== --- csw/mgar/pkg/Vispan/trunk/files/CSWvispan.gspec (rev 0) +++ csw/mgar/pkg/Vispan/trunk/files/CSWvispan.gspec 2009-03-12 13:37:47 UTC (rev 3725) @@ -0,0 +1,10 @@ +%var bitname vispan +%var pkgname CSWvispan +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright +1995-2008 Gisle Aas. All rights reserved. +1995 Martijn Koster. All rights reserved. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 15:46:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 14:46:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3726] csw/mgar/gar/v2 Message-ID: Revision: 3726 http://gar.svn.sourceforge.net/gar/?rev=3726&view=rev Author: dmichelsen Date: 2009-03-12 14:46:31 +0000 (Thu, 12 Mar 2009) Log Message: ----------- mGAR v2: Add DONADA for otherwise empty rules Modified Paths: -------------- csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-03-12 13:37:47 UTC (rev 3725) +++ csw/mgar/gar/v2/gar.mk 2009-03-12 14:46:31 UTC (rev 3726) @@ -331,6 +331,7 @@ @$(DONADA) patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated + @$(DONADA) # returns true if patch has completed successfully, false # otherwise @@ -375,11 +376,12 @@ endif configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure - $(DONADA) + @$(DONADA) configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated + @$(DONADA) .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-03-12 13:37:47 UTC (rev 3725) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-03-12 14:46:31 UTC (rev 3726) @@ -414,10 +414,10 @@ cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \ fi \ ) - $(MAKECOOKIE) + @$(MAKECOOKIE) merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC)) - $(DONADA) + @$(DONADA) # package - Use the mkpackage utility to create Solaris packages # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 16:05:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 15:05:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3727] csw/mgar/pkg/pca/tags/pca-20090224-01, REV=2009.03.12 / Message-ID: Revision: 3727 http://gar.svn.sourceforge.net/gar/?rev=3727&view=rev Author: dmichelsen Date: 2009-03-12 15:05:25 +0000 (Thu, 12 Mar 2009) Log Message: ----------- pca: Tag release 20090224-01,REV=2009.03.12 Added Paths: ----------- csw/mgar/pkg/pca/tags/pca-20090224-01,REV=2009.03.12/ Property changes on: csw/mgar/pkg/pca/tags/pca-20090224-01,REV=2009.03.12 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar -r3678 https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Mar 12 16:10:15 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 12 Mar 2009 15:10:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[3728] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 3728 http://gar.svn.sourceforge.net/gar/?rev=3728&view=rev Author: harpchad Date: 2009-03-12 15:10:12 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Disable upstream check for now Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-03-12 15:05:25 UTC (rev 3727) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-03-12 15:10:12 UTC (rev 3728) @@ -25,8 +25,8 @@ CATALOGNAME_CSWcurlrt = curlrt CATALOGNAME_CSWcurldevel = curldevel -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# Upstream check seem to interfere with build on 8s? +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 LIBDEPS += lib/openssl CONFIGURE_ARGS = $(DIRPATHS) --with-ssl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Mar 12 16:36:40 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 12 Mar 2009 15:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[3729] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 3729 http://gar.svn.sourceforge.net/gar/?rev=3729&view=rev Author: harpchad Date: 2009-03-12 15:36:40 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Add fixme.sh to avoid libtool problems Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pidgin/trunk/files/fixme.sh Removed Paths: ------------- csw/mgar/pkg/pidgin/trunk/files/x11.pc Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2009-03-12 15:10:12 UTC (rev 3728) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2009-03-12 15:36:40 UTC (rev 3729) @@ -9,7 +9,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += x11.pc +DISTFILES += fixme.sh CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += '--with-dbus-services=/opt/csw/etc/dbus-1' @@ -25,12 +25,11 @@ MSGFMT=/opt/csw/bin/gmsgfmt MSGMERGE=/opt/csw/bin/gmsgmerge SED=/opt/csw/bin/gsed -EXTRA_CONFIGURE_EXPORTS = DOT XGETTEXT MSGFMT MSGMERGE SED +X11_CFLAGS=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API +X11_LIBS=-lX11 +EXTRA_CONFIGURE_EXPORTS = DOT XGETTEXT MSGFMT MSGMERGE SED X11_CFLAGS X11_LIBS EXTRA_INC = /opt/csw/include/ncurses -#Need to include our own x11.pc file as solaris 8 doesn't have one -EXTRA_PKGCONFIG_PATH = $(CURDIR)/$(WORKDIR) - TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release @@ -45,5 +44,9 @@ REQUIRED_PKGS_CSWpidgin += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif REQUIRED_PKGS_CSWpidgin += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus +include gar/category.mk -include gar/category.mk +post-configure-$(MODULATION): + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2009-03-12 15:10:12 UTC (rev 3728) +++ csw/mgar/pkg/pidgin/trunk/checksums 2009-03-12 15:36:40 UTC (rev 3729) @@ -1,2 +1,2 @@ 08d9c0c8dd43dbcec6f67d8ba596029f download/pidgin-2.5.5.tar.gz -715c7954371b53f6ca4083a011cadfe5 download/x11.pc +41ec540885de7c34625768aa1fb9682b download/fixme.sh Added: csw/mgar/pkg/pidgin/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/fixme.sh 2009-03-12 15:36:40 UTC (rev 3729) @@ -0,0 +1,49 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} +done + +LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +if [ -f ${LTMAIN} ]; then + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} +fi + Property changes on: csw/mgar/pkg/pidgin/trunk/files/fixme.sh ___________________________________________________________________ Added: svn:executable + * Deleted: csw/mgar/pkg/pidgin/trunk/files/x11.pc =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/x11.pc 2009-03-12 15:10:12 UTC (rev 3728) +++ csw/mgar/pkg/pidgin/trunk/files/x11.pc 2009-03-12 15:36:40 UTC (rev 3729) @@ -1,12 +0,0 @@ -prefix=/usr/openwin -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -xthreadlib= - -Name: X11 -Description: X Library -Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API -Libs: -L${libdir} -R${libdir} -lX11 -Libs.private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 16:48:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 15:48:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3730] csw/mgar/pkg Message-ID: Revision: 3730 http://gar.svn.sourceforge.net/gar/?rev=3730&view=rev Author: dmichelsen Date: 2009-03-12 15:48:25 +0000 (Thu, 12 Mar 2009) Log Message: ----------- flex_new: Adjust directory name in GAR to match catalog name Added Paths: ----------- csw/mgar/pkg/flex_new/ Removed Paths: ------------- csw/mgar/pkg/flex/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Mar 12 16:50:50 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 12 Mar 2009 15:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[3731] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 3731 http://gar.svn.sourceforge.net/gar/?rev=3731&view=rev Author: valholla Date: 2009-03-12 15:50:50 +0000 (Thu, 12 Mar 2009) Log Message: ----------- recipe in testing Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-03-12 15:48:25 UTC (rev 3730) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-03-12 15:50:50 UTC (rev 3731) @@ -130,7 +130,7 @@ $(DONADA) fix-install: - @(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8) + @(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8.8) copy-templates: ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 17:05:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 16:05:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3732] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 3732 http://gar.svn.sourceforge.net/gar/?rev=3732&view=rev Author: dmichelsen Date: 2009-03-12 16:05:06 +0000 (Thu, 12 Mar 2009) Log Message: ----------- gtar: Update to 1.22 Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2009-03-12 15:50:50 UTC (rev 3731) +++ csw/mgar/pkg/gtar/trunk/Makefile 2009-03-12 16:05:06 UTC (rev 3732) @@ -1,5 +1,5 @@ GARNAME = tar -GARVERSION = 1.21 +GARVERSION = 1.22 CATEGORIES = utils DESCRIPTION = GNU tape archiver Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2009-03-12 15:50:50 UTC (rev 3731) +++ csw/mgar/pkg/gtar/trunk/checksums 2009-03-12 16:05:06 UTC (rev 3732) @@ -1 +1 @@ -e7ae56b3bf924d5108b57b544b247c50 download/tar-1.21.tar.gz +efafad1b256e3de410f4fce5335d9c9d download/tar-1.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 17:09:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 16:09:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3733] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 3733 http://gar.svn.sourceforge.net/gar/?rev=3733&view=rev Author: dmichelsen Date: 2009-03-12 16:09:37 +0000 (Thu, 12 Mar 2009) Log Message: ----------- mGAR v2: Fix environment for test-%/Makefile Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-03-12 16:05:06 UTC (rev 3732) +++ csw/mgar/gar/v2/gar.lib.mk 2009-03-12 16:09:37 UTC (rev 3733) @@ -546,7 +546,7 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(BUILD_ENV) $(MAKE) -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 17:11:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 16:11:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[3734] csw/mgar/pkg/ldapvi/trunk Message-ID: Revision: 3734 http://gar.svn.sourceforge.net/gar/?rev=3734&view=rev Author: dmichelsen Date: 2009-03-12 16:11:40 +0000 (Thu, 12 Mar 2009) Log Message: ----------- ldapvi: Move to mGAR v2, fix $ISALIST runpath Modified Paths: -------------- csw/mgar/pkg/ldapvi/trunk/Makefile csw/mgar/pkg/ldapvi/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.depend csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.gspec Property Changed: ---------------- csw/mgar/pkg/ldapvi/trunk/ Property changes on: csw/mgar/pkg/ldapvi/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ldapvi/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldapvi/trunk/Makefile 2009-03-12 16:09:37 UTC (rev 3733) +++ csw/mgar/pkg/ldapvi/trunk/Makefile 2009-03-12 16:11:40 UTC (rev 3734) @@ -11,8 +11,10 @@ MASTER_SITES = http://www.lichteblau.com/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWldapvi,depend) +REQUIRED_PKGS = CSWggettextrt CSWreadline CSWglib2 CSWlibpopt +REQUIRED_PKGS += CSWosslrt CSWsasl CSWoldaprt + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -20,6 +22,7 @@ PREREQUISITE_PKGS = CSWoldapdevel +RUNPATHQUOTE = 1 CONFIGURE_ARGS = $(DIRPATHS) INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/ldapvi/trunk/checksums =================================================================== --- csw/mgar/pkg/ldapvi/trunk/checksums 2009-03-12 16:09:37 UTC (rev 3733) +++ csw/mgar/pkg/ldapvi/trunk/checksums 2009-03-12 16:11:40 UTC (rev 3734) @@ -1,4 +1,2 @@ 6dc2f5441ac5f1e2b5b036e3521012cc download/ldapvi-1.7.tar.gz -fdcaf3f4a8a61a8af338119e590ba037 download/CSWldapvi.gspec -a81060764b96d70f4cf64de9da8e9a49 download/CSWldapvi.depend d1f0031d0db3b7bb68c258185a0c63ad download/patch-putenv.diff Deleted: csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.depend =================================================================== --- csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.depend 2009-03-12 16:09:37 UTC (rev 3733) +++ csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.depend 2009-03-12 16:11:40 UTC (rev 3734) @@ -1,7 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWreadline readline - library to enable interactive line editing -P CSWglib2 glib2 - the low-level core library for GTK+ and GNOME -P CSWlibpopt libpopt - Command line option parsing library -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWsasl sasl - Simple Authentication and Security Layer -P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) Deleted: csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.gspec =================================================================== --- csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.gspec 2009-03-12 16:09:37 UTC (rev 3733) +++ csw/mgar/pkg/ldapvi/trunk/files/CSWldapvi.gspec 2009-03-12 16:11:40 UTC (rev 3734) @@ -1,4 +0,0 @@ -%var bitname ldapvi -%var pkgname CSWldapvi -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Mar 12 17:29:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Mar 2009 16:29:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3735] csw/mgar/pkg/flex_new/trunk Message-ID: Revision: 3735 http://gar.svn.sourceforge.net/gar/?rev=3735&view=rev Author: dmichelsen Date: 2009-03-12 16:29:52 +0000 (Thu, 12 Mar 2009) Log Message: ----------- flex_new: Use dynamic gspecs and fix test cases Modified Paths: -------------- csw/mgar/pkg/flex_new/trunk/Makefile csw/mgar/pkg/flex_new/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.depend csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.gspec Property Changed: ---------------- csw/mgar/pkg/flex_new/trunk/ Property changes on: csw/mgar/pkg/flex_new/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/flex_new/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex_new/trunk/Makefile 2009-03-12 16:11:40 UTC (rev 3734) +++ csw/mgar/pkg/flex_new/trunk/Makefile 2009-03-12 16:29:52 UTC (rev 3735) @@ -17,15 +17,21 @@ MASTER_SITES = $(SF_MIRRORS) DISTNAME = flex-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 -DISTFILES += $(call admfiles,CSWflex-new,depend) +PACKAGES = CSWflex-new +CATALOGNAME = flex_new + +REQUIRED_PKGS = CSWggettextrt CSWiconv + CONFIGURE_ARGS = --prefix=$(libexecdir)/$(GARNAME)-$(GARVERSION) TEST_TARGET = check -TEST_SCRIPTS = include gar/category.mk +# Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff +TEST_ENV += PATH=$(prefix)/gnu:$(PATH) + post-install: @mkdir -p $(DESTDIR)$(bindir) @gln -sf ../libexec/$(GARNAME)-$(GARVERSION)/bin/flex $(DESTDIR)$(bindir)/newflex Modified: csw/mgar/pkg/flex_new/trunk/checksums =================================================================== --- csw/mgar/pkg/flex_new/trunk/checksums 2009-03-12 16:11:40 UTC (rev 3734) +++ csw/mgar/pkg/flex_new/trunk/checksums 2009-03-12 16:29:52 UTC (rev 3735) @@ -1,3 +1 @@ 10714e50cea54dc7a227e3eddcd44d57 download/flex-2.5.35.tar.bz2 -9d4315723195ff29e61742388703ff15 download/CSWflex-new.gspec -5237ff9f4dbe4ec493425d4ffc5fc51a download/CSWflex-new.depend Deleted: csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.depend =================================================================== --- csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.depend 2009-03-12 16:11:40 UTC (rev 3734) +++ csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.depend 2009-03-12 16:29:52 UTC (rev 3735) @@ -1,2 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library Deleted: csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.gspec =================================================================== --- csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.gspec 2009-03-12 16:11:40 UTC (rev 3734) +++ csw/mgar/pkg/flex_new/trunk/files/CSWflex-new.gspec 2009-03-12 16:29:52 UTC (rev 3735) @@ -1,4 +0,0 @@ -%var bitname flex_new -%var pkgname CSWflex-new -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Mar 12 17:46:58 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 12 Mar 2009 16:46:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3736] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 3736 http://gar.svn.sourceforge.net/gar/?rev=3736&view=rev Author: harpchad Date: 2009-03-12 16:46:53 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Makefile cleanup Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2009-03-12 16:29:52 UTC (rev 3735) +++ csw/mgar/pkg/curl/trunk/Makefile 2009-03-12 16:46:53 UTC (rev 3736) @@ -52,9 +52,11 @@ @cp $(FILEDIR)/libcurl.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libcurl.so.2.0.2 @( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.3.0.0 libcurl.so.3 ) @( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.2.0.2 libcurl.so.2 ) + $(DONADA) post-install-isa-i386: @cp $(FILEDIR)/libcurl.so.3.0.0.i $(INSTALLISADIR)/opt/csw/lib/libcurl.so.3.0.0 @cp $(FILEDIR)/libcurl.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libcurl.so.2.0.2 @( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.3.0.0 libcurl.so.3 ) @( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.2.0.2 libcurl.so.2 ) + $(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 12 18:23:51 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 12 Mar 2009 17:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3737] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 3737 http://gar.svn.sourceforge.net/gar/?rev=3737&view=rev Author: hson Date: 2009-03-12 17:23:51 +0000 (Thu, 12 Mar 2009) Log Message: ----------- imagemagick: Update to 6.4.9-10, fix dependencies, added coders from 6.2.9 for backward compatibility Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-03-12 16:46:53 UTC (rev 3736) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-03-12 17:23:51 UTC (rev 3737) @@ -1,6 +1,6 @@ GARNAME = imagemagick GARVERSION = 6.4.9 -GARSUBREV = 6 +GARSUBREV = 10 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -13,12 +13,6 @@ MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ DISTFILES = ImageMagick-$(GARVERSION)-$(GARSUBREV).tar.bz2 -DISTFILES += libMagick++.so.10.0.4.i -DISTFILES += libMagick++.so.10.0.4.s -DISTFILES += libMagick.so.10.0.4.i -DISTFILES += libMagick.so.10.0.4.s -DISTFILES += libWand.so.10.0.4.i -DISTFILES += libWand.so.10.0.4.s DISTNAME = ImageMagick-$(GARVERSION)-$(GARSUBREV) @@ -26,11 +20,10 @@ LICENSE = LICENSE -REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWgcc2g++rt -REQUIRED_PKGS += CSWggettext CSWggettextrt CSWglib2 CSWgs CSWgtk2 CSWiconv -REQUIRED_PKGS += CSWilmbase CSWjasper CSWjbigkit CSWjpeg CSWlcms CSWlibcairo -REQUIRED_PKGS += CSWlibfpx CSWlibrsvg CSWlibxml2 CSWopenexr CSWperl CSWpng -REQUIRED_PKGS += CSWsunmath CSWtiff CSWwmf CSWzlib +REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWggettextrt +REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit +REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 +REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 @@ -55,19 +48,25 @@ include gar/category.mk post-install-isa-sparcv8: - @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10.0.4 - @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libWand.so.10.0.4 - @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10.0.4 - @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10 - @ln -s libWand.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libWand.so.10 - @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10 - @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)/opt/csw/share/doc/ImageMagick + @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 + @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 + @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 + @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 + @ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 + @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 + @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick + echo $(DESTDIR) + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) + @$(MAKECOOKIE) post-install-isa-i386: - @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10.0.4 - @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libWand.so.10.0.4 - @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10.0.4 - @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10 - @ln -s libWand.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libWand.so.10 - @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10 - @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)/opt/csw/share/doc/ImageMagick + @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 + @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 + @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 + @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 + @ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 + @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 + @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick + echo $(DESTDIR) + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2009-03-12 16:46:53 UTC (rev 3736) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2009-03-12 17:23:51 UTC (rev 3737) @@ -1,8 +1,2 @@ -d65a4cd3cf103d49085a55c90c871854 download/ImageMagick-6.4.9-6.tar.bz2 -26ba45bf8a01f64c01973522657e1e09 download/libMagick++.so.10.0.4.i -d4d961c6aab8c2fb4067953f80a5213b download/libMagick++.so.10.0.4.s -c6254fa21d534ca99be36547ce599709 download/libMagick.so.10.0.4.i -c3da4ba416306f5c064cfcc109f69091 download/libMagick.so.10.0.4.s -f46e2f8d0bd8f2c1206534592ebda333 download/libWand.so.10.0.4.i -0f6e06e2d8e5b446e90be3a8ae328761 download/libWand.so.10.0.4.s +4efbf9ba504ce228ed67e6db4c8245ff download/ImageMagick-6.4.9-10.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 download/Makefile.patch Added: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 12 19:50:25 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 12 Mar 2009 18:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3738] csw/mgar/pkg/cpan/XML-Parser/trunk Message-ID: Revision: 3738 http://gar.svn.sourceforge.net/gar/?rev=3738&view=rev Author: hson Date: 2009-03-12 18:50:25 +0000 (Thu, 12 Mar 2009) Log Message: ----------- XML-Parser: Move to gar v2, removed manual prototype and depend, update to 2.36 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile csw/mgar/pkg/cpan/XML-Parser/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.depend csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/XML-Parser/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-Parser/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2009-03-12 17:23:51 UTC (rev 3737) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2009-03-12 18:50:25 UTC (rev 3738) @@ -1,7 +1,7 @@ GARNAME = XML-Parser -GARVERSION = 2.31 +GARVERSION = 2.36 CATEGORIES = cpan -AUTHOR = COOPERCL +AUTHOR = MSERGEANT DESCRIPTION = a module for parsing XML documents define BLURB @@ -15,11 +15,16 @@ options given at XML::Parser creation time. endef -DISTFILES = $(call admfiles,CSWpmxmlparser,depend prototype) +DISTFILES = $(call admfiles,CSWpmxmlparser,) + +REQUIRED_PKGS += CSWexpat + DEPENDS += lib/expat CONFIGURE_ARGS = EXPATINCPATH=$(includedir) CONFIGURE_ARGS += EXPATLIBPATH=$(libdir) +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/checksums 2009-03-12 17:23:51 UTC (rev 3737) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/checksums 2009-03-12 18:50:25 UTC (rev 3738) @@ -1,4 +1,4 @@ 630e7ecbce358dd2572e5ef529676417 download/CSWpmxmlparser.gspec -ed1cab84f40b031c09f91085dbe8cddd download/CSWpmxmlparser.depend -45c170638301f4dca82f84a81cb16630 download/CSWpmxmlparser.prototype -01f136a5f71631845979fd2b797b3ce3 download/XML-Parser-2.31.tar.gz +9c8bed940180401cb0bfcd7761ad5c1a download/CSWpmxmlparser.depend +4b19d28451507cdd65880c1fce48718e download/CSWpmxmlparser.prototype +1b868962b658bd87e1563ecd56498ded download/XML-Parser-2.36.tar.gz Deleted: csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.depend =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.depend 2009-03-12 17:23:51 UTC (rev 3737) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.depend 2009-03-12 18:50:25 UTC (rev 3738) @@ -1 +0,0 @@ -P CSWexpat expat - XML Parser Toolkit Deleted: csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.prototype =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.prototype 2009-03-12 17:23:51 UTC (rev 3737) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/files/CSWpmxmlparser.prototype 2009-03-12 18:50:25 UTC (rev 3738) @@ -1,39 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/XML 0755 root bin -d none /opt/csw/lib/perl/csw/XML/Parser 0755 root bin -f none /opt/csw/lib/perl/csw/XML/Parser.pm 0444 root bin -d none /opt/csw/lib/perl/csw/XML/Parser/Encodings 0755 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/Japanese_Encodings.msg 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/README 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/big5.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/euc-kr.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-2.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-3.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-4.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-5.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-7.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-8.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/iso-8859-9.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/windows-1250.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/x-euc-jp-jisx0221.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/x-euc-jp-unicode.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/x-sjis-cp932.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/x-sjis-jdk117.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/x-sjis-jisx0221.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Encodings/x-sjis-unicode.enc 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/Expat.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/Parser/LWPExternEnt.pl 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML/Parser 0755 root bin -f none /opt/csw/lib/perl/csw/auto/XML/Parser/.packlist 0644 root bin -d none /opt/csw/lib/perl/csw/auto/XML/Parser/Expat 0755 root bin -f none /opt/csw/lib/perl/csw/auto/XML/Parser/Expat/Expat.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/XML/Parser/Expat/Expat.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/XML::Parser.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::Parser::Expat.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 12 20:25:06 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 12 Mar 2009 19:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[3739] csw/mgar/pkg/git/trunk Message-ID: Revision: 3739 http://gar.svn.sourceforge.net/gar/?rev=3739&view=rev Author: bdwalton Date: 2009-03-12 19:25:06 +0000 (Thu, 12 Mar 2009) Log Message: ----------- - Add patches to fix autoconf support (mainly to get proper pthread support) - Switch to suncc - Specifically set a few more configure args (shouldn't be needed, but they better document what will happen) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-03-12 18:50:25 UTC (rev 3738) +++ csw/mgar/pkg/git/trunk/Makefile 2009-03-12 19:25:06 UTC (rev 3739) @@ -57,6 +57,13 @@ GIT_TREEISH_git.git = v$(GARVERSION) PATCHFILES = doc-makefile.patch +PATCHFILES += 0001-configure-ensure-settings-from-user-are-also-usable.patch +PATCHFILES += 0002-configure-reorganize-flow-of-argument-checks.patch +PATCHFILES += 0003-configure-add-macros-to-stash-FLAG-variables.patch +PATCHFILES += 0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch +PATCHFILES += 0005-configure-asciidoc-version-test-cleanup.patch +PATCHFILES += 0006-configure-make-iconv-tests-aware-of-user-arguments.patch +PATCHFILES += 0007-configure-rework-pthread-handling-to-allow-for-user.patch PKGFILES_CSWgitsvn = .*svn.* PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* @@ -69,13 +76,14 @@ # software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER = GNU - CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-iconv=$(prefix) +CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-expat=$(prefix) +CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ETC_CONFIG=$(sysconfdir)/gitconfig V=1 \ Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2009-03-12 18:50:25 UTC (rev 3738) +++ csw/mgar/pkg/git/trunk/checksums 2009-03-12 19:25:06 UTC (rev 3739) @@ -1,3 +1,8 @@ 075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch -97290254ce2e9e6c37fdd824140fda85 download/0001-git-svn-fix-to-avoid-using-strftime-z.patch -1081a8ca474317f1963e0d1ee69832de download/0002-git-svn-return-original-format_svn_date-semantics.patch +d88d34fc8e4ce18fe738753a06417eac download/0001-configure-ensure-settings-from-user-are-also-usable.patch +9f1f5c3f7759319d647420d330f87c28 download/0002-configure-reorganize-flow-of-argument-checks.patch +dc54bd8c79b58724eaab77e15f9e2029 download/0003-configure-add-macros-to-stash-FLAG-variables.patch +b1c0911b53bcccb943b1f7bdc6db5237 download/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch +50fa0de30bbc019e6c5e43c20cef423a download/0005-configure-asciidoc-version-test-cleanup.patch +cde5cd3ceebe13864dd8e3718e104387 download/0006-configure-make-iconv-tests-aware-of-user-arguments.patch +89dbcc3180bf4e651e9e64d4de3f6df0 download/0007-configure-rework-pthread-handling-to-allow-for-user.patch Added: csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,56 @@ +From 63b740b85248d3ff5a2a458cc5068f5e2c180f0d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 12 Mar 2009 17:30:56 +0100 +Subject: [PATCH] configure: ensure settings from user are also usable in the script + +Allow things set by the user (--with-lib, --with-iconv, etc) to set +variables for use by other parts of the script. Display values as +they're set. + +Signed-off-by: Ben Walton +--- + configure.ac | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 082a03d..0b314d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,6 +42,8 @@ else \ + if test "$withval" = "yes"; then \ + AC_MSG_WARN([You should provide path for --with-$1=PATH]); \ + else \ ++ m4_toupper($1)_PATH=$withval; \ ++ AC_MSG_NOTICE([Setting m4_toupper($1)_PATH to $withval]); \ + GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \ + fi; \ + fi; \ +@@ -61,6 +63,8 @@ elif test "$withval" = "yes"; then \ + m4_toupper(NO_$1)=; \ + else \ + m4_toupper(NO_$1)=; \ ++ m4_toupper($1)DIR=$withval; \ ++ AC_MSG_NOTICE([Setting m4_toupper($1)DIR to $withval]); \ + GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \ + fi \ + ])# GIT_PARSE_WITH +@@ -86,9 +90,16 @@ AC_ARG_WITH([lib], + [if test "$withval" = "no" || test "$withval" = "yes"; then \ + AC_MSG_WARN([You should provide name for --with-lib=ARG]); \ + else \ ++ lib=$withval; \ ++ AC_MSG_NOTICE([Setting lib to '$lib']); \ + GIT_CONF_APPEND_LINE(lib=$withval); \ + fi; \ + ],[]) ++ ++if test -z "$lib"; then ++ AC_MSG_NOTICE([Setting lib to 'lib' (the default)]) ++ lib=lib ++fi + # + # Define SHELL_PATH to provide path to shell. + GIT_ARG_SET_PATH(shell) +-- +1.6.0.5 + Added: csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,212 @@ +From 142c46f4db8f7d32ed455316704503fca2bf4857 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 12 Mar 2009 17:33:38 +0100 +Subject: [PATCH] configure: reorganize flow of argument checks + +Move the argument tests from the 'site overrides' so that they are +ahead of any library tests. This allows for library tests to take +user specified paths into account. The intent here is to avoid things +like NO_DEFLATE_BOUND being set due to finding old zlib when the user +has specified an alternate location for zlib. (Ignore the fact that +properly set *FLAGS can avoid solve this issue.) + +Signed-off-by: Ben Walton +--- + configure.ac | 174 +++++++++++++++++++++++++++++----------------------------- + 1 files changed, 87 insertions(+), 87 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0b314d7..0bff480 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,6 +100,93 @@ if test -z "$lib"; then + AC_MSG_NOTICE([Setting lib to 'lib' (the default)]) + lib=lib + fi ++ ++## Site configuration (override autodetection) ++## --with-PACKAGE[=ARG] and --without-PACKAGE ++AC_MSG_NOTICE([CHECKS for site configuration]) ++# ++# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability ++# tests. These tests take up a significant amount of the total test time ++# but are not needed unless you plan to talk to SVN repos. ++# ++# Define MOZILLA_SHA1 environment variable when running make to make use of ++# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast ++# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default ++# choice) has very fast version optimized for i586. ++# ++# Define PPC_SHA1 environment variable when running make to make use of ++# a bundled SHA1 routine optimized for PowerPC. ++# ++# Define ARM_SHA1 environment variable when running make to make use of ++# a bundled SHA1 routine optimized for ARM. ++# ++# Define NO_OPENSSL environment variable if you do not have OpenSSL. ++# This also implies MOZILLA_SHA1. ++# ++# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in ++# /foo/bar/include and /foo/bar/lib directories. ++AC_ARG_WITH(openssl, ++AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)]) ++AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\ ++GIT_PARSE_WITH(openssl)) ++# ++# Define NO_CURL if you do not have curl installed. git-http-pull and ++# git-http-push are not built, and you cannot use http:// and https:// ++# transports. ++# ++# Define CURLDIR=/foo/bar if your curl header and library files are in ++# /foo/bar/include and /foo/bar/lib directories. ++AC_ARG_WITH(curl, ++AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)]) ++AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]), ++GIT_PARSE_WITH(curl)) ++# ++# Define NO_EXPAT if you do not have expat installed. git-http-push is ++# not built, and you cannot push using http:// and https:// transports. ++# ++# Define EXPATDIR=/foo/bar if your expat header and library files are in ++# /foo/bar/include and /foo/bar/lib directories. ++AC_ARG_WITH(expat, ++AS_HELP_STRING([--with-expat], ++[support git-push using http:// and https:// transports via WebDAV (default is YES)]) ++AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]), ++GIT_PARSE_WITH(expat)) ++# ++# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink ++# installed in /sw, but don't want GIT to link against any libraries ++# installed there. If defined you may specify your own (or Fink's) ++# include directories and library directories by defining CFLAGS ++# and LDFLAGS appropriately. ++# ++# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X, ++# have DarwinPorts installed in /opt/local, but don't want GIT to ++# link against any libraries installed there. If defined you may ++# specify your own (or DarwinPort's) include directories and ++# library directories by defining CFLAGS and LDFLAGS appropriately. ++# ++# Define NO_MMAP if you want to avoid mmap. ++# ++# Define NO_ICONV if your libc does not properly support iconv. ++AC_ARG_WITH(iconv, ++AS_HELP_STRING([--without-iconv], ++[if your architecture doesn't properly support iconv]) ++AS_HELP_STRING([--with-iconv=PATH], ++[PATH is prefix for libiconv library and headers]) ++AS_HELP_STRING([], ++[used only if you need linking with libiconv]), ++GIT_PARSE_WITH(iconv)) ++ ++## --enable-FEATURE[=ARG] and --disable-FEATURE ++# ++# Define USE_NSEC below if you want git to care about sub-second file mtimes ++# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and ++# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely ++# randomly break unless your underlying filesystem supports those sub-second ++# times (my ext3 doesn't). ++# ++# Define USE_STDEV below if you want git to care about the underlying device ++# change being considered an inode change from the update-index perspective. ++ + # + # Define SHELL_PATH to provide path to shell. + GIT_ARG_SET_PATH(shell) +@@ -526,93 +613,6 @@ AC_SUBST(PTHREAD_LIBS) + AC_SUBST(NO_PTHREADS) + AC_SUBST(THREADED_DELTA_SEARCH) + +-## Site configuration (override autodetection) +-## --with-PACKAGE[=ARG] and --without-PACKAGE +-AC_MSG_NOTICE([CHECKS for site configuration]) +-# +-# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability +-# tests. These tests take up a significant amount of the total test time +-# but are not needed unless you plan to talk to SVN repos. +-# +-# Define MOZILLA_SHA1 environment variable when running make to make use of +-# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast +-# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default +-# choice) has very fast version optimized for i586. +-# +-# Define PPC_SHA1 environment variable when running make to make use of +-# a bundled SHA1 routine optimized for PowerPC. +-# +-# Define ARM_SHA1 environment variable when running make to make use of +-# a bundled SHA1 routine optimized for ARM. +-# +-# Define NO_OPENSSL environment variable if you do not have OpenSSL. +-# This also implies MOZILLA_SHA1. +-# +-# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in +-# /foo/bar/include and /foo/bar/lib directories. +-AC_ARG_WITH(openssl, +-AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)]) +-AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\ +-GIT_PARSE_WITH(openssl)) +-# +-# Define NO_CURL if you do not have curl installed. git-http-pull and +-# git-http-push are not built, and you cannot use http:// and https:// +-# transports. +-# +-# Define CURLDIR=/foo/bar if your curl header and library files are in +-# /foo/bar/include and /foo/bar/lib directories. +-AC_ARG_WITH(curl, +-AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)]) +-AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]), +-GIT_PARSE_WITH(curl)) +-# +-# Define NO_EXPAT if you do not have expat installed. git-http-push is +-# not built, and you cannot push using http:// and https:// transports. +-# +-# Define EXPATDIR=/foo/bar if your expat header and library files are in +-# /foo/bar/include and /foo/bar/lib directories. +-AC_ARG_WITH(expat, +-AS_HELP_STRING([--with-expat], +-[support git-push using http:// and https:// transports via WebDAV (default is YES)]) +-AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]), +-GIT_PARSE_WITH(expat)) +-# +-# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink +-# installed in /sw, but don't want GIT to link against any libraries +-# installed there. If defined you may specify your own (or Fink's) +-# include directories and library directories by defining CFLAGS +-# and LDFLAGS appropriately. +-# +-# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X, +-# have DarwinPorts installed in /opt/local, but don't want GIT to +-# link against any libraries installed there. If defined you may +-# specify your own (or DarwinPort's) include directories and +-# library directories by defining CFLAGS and LDFLAGS appropriately. +-# +-# Define NO_MMAP if you want to avoid mmap. +-# +-# Define NO_ICONV if your libc does not properly support iconv. +-AC_ARG_WITH(iconv, +-AS_HELP_STRING([--without-iconv], +-[if your architecture doesn't properly support iconv]) +-AS_HELP_STRING([--with-iconv=PATH], +-[PATH is prefix for libiconv library and headers]) +-AS_HELP_STRING([], +-[used only if you need linking with libiconv]), +-GIT_PARSE_WITH(iconv)) +- +-## --enable-FEATURE[=ARG] and --disable-FEATURE +-# +-# Define USE_NSEC below if you want git to care about sub-second file mtimes +-# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and +-# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely +-# randomly break unless your underlying filesystem supports those sub-second +-# times (my ext3 doesn't). +-# +-# Define USE_STDEV below if you want git to care about the underlying device +-# change being considered an inode change from the update-index perspective. +- +- + ## Output files + AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"]) + AC_OUTPUT +-- +1.6.0.5 + Added: csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,54 @@ +From 620f4827cf3e2899fe9ffd7245f87bb558446832 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 11 Mar 2009 16:59:22 +0100 +Subject: [PATCH] configure: add macros to stash FLAG variables + +Allow for quick stash/unstash of CPPFLAGS and LDFLAGS. Library tests +can now be easily bracketted with these macros to allow for values +set in user/site arguments. + +Signed-off-by: Ben Walton +--- + configure.ac | 26 ++++++++++++++++++++++++++ + 1 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0bff480..469c9a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -80,6 +80,32 @@ AC_DEFUN([GIT_CHECK_FUNC],[AC_CHECK_FUNC([$1],[ + AC_SEARCH_LIBS([$1],, + [$2],[$3]) + ],[$3])]) ++ ++dnl ++dnl GIT_STASH_FLAGS(BASEPATH_VAR) ++dnl ----------------------------- ++dnl Allow for easy stashing of LDFLAGS and CPPFLAGS before running ++dnl tests that may want to take user settings into account. ++AC_DEFUN([GIT_STASH_FLAGS],[ ++if test -n "$1"; then ++ old_CPPFLAGS="$CPPFLAGS" ++ old_LDFLAGS="$LDFLAGS" ++ CPPFLAGS="-I$1/include $CPPFLAGS" ++ LDFLAGS="-L$1/$lib $LDFLAGS" ++fi ++]) ++ ++dnl ++dnl GIT_UNSTASH_FLAGS(BASEPATH_VAR) ++dnl ----------------------------- ++dnl Restore the stashed *FLAGS values. ++AC_DEFUN([GIT_UNSTASH_FLAGS],[ ++if test -n "$1"; then ++ CPPFLAGS="$old_CPPFLAGS" ++ LDFLAGS="$old_LDFLAGS" ++fi ++]) ++ + ## Site configuration related to programs (before tests) + ## --with-PACKAGE[=ARG] and --without-PACKAGE + # +-- +1.6.0.5 + Added: csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,113 @@ +From 412626c9183b5109e04826c9ce8033636258ee91 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 11 Mar 2009 17:22:45 +0100 +Subject: [PATCH] configure: wrap some library tests with GIT_STASH_FLAGS + +Libraries that can have user specificed base paths are wrapped with +GIT_STASH_FLAGS/GIT_UNSTASH_FLAGS to ensure that the proper versions +on the system are tested. This ensures, for example, that the zlib +tests for deflateUnbound are done with the version of zlib requested +by the user. This is most useful in the absence of good settings for +CPPFLAGS and/or LDFLAGS. + +Signed-off-by: Ben Walton +--- + configure.ac | 36 +++++++++++++++++++++++++++++++++++- + 1 files changed, 35 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 469c9a9..fe9d7eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -315,33 +315,57 @@ AC_MSG_NOTICE([CHECKS for libraries]) + # + # Define NO_OPENSSL environment variable if you do not have OpenSSL. + # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). ++ ++GIT_STASH_FLAGS($OPENSSLDIR) ++ + AC_CHECK_LIB([crypto], [SHA1_Init], + [NEEDS_SSL_WITH_CRYPTO=], + [AC_CHECK_LIB([ssl], [SHA1_Init], + [NEEDS_SSL_WITH_CRYPTO=YesPlease + NEEDS_SSL_WITH_CRYPTO=], + [NO_OPENSSL=YesPlease])]) ++ ++GIT_UNSTASH_FLAGS($OPENSSLDIR) ++ + AC_SUBST(NEEDS_SSL_WITH_CRYPTO) + AC_SUBST(NO_OPENSSL) ++ + # + # Define NO_CURL if you do not have libcurl installed. git-http-pull and + # git-http-push are not built, and you cannot use http:// and https:// + # transports. ++ ++GIT_STASH_FLAGS($CURLDIR) ++ + AC_CHECK_LIB([curl], [curl_global_init], + [NO_CURL=], + [NO_CURL=YesPlease]) ++ ++GIT_UNSTASH_FLAGS($CURLDIR) ++ + AC_SUBST(NO_CURL) ++ + # + # Define NO_EXPAT if you do not have expat installed. git-http-push is + # not built, and you cannot push using http:// and https:// transports. ++ ++GIT_STASH_FLAGS($EXPATDIR) ++ + AC_CHECK_LIB([expat], [XML_ParserCreate], + [NO_EXPAT=], + [NO_EXPAT=YesPlease]) ++ ++GIT_UNSTASH_FLAGS($EXPATDIR) ++ + AC_SUBST(NO_EXPAT) ++ + # + # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin and + # some Solaris installations). + # Define NO_ICONV if neither libc nor libiconv support iconv. ++ ++GIT_STASH_FLAGS($ICONVDIR) ++ + AC_DEFUN([ICONVTEST_SRC], [ + #include + +@@ -365,11 +389,17 @@ AC_LINK_IFELSE(ICONVTEST_SRC, + [AC_MSG_RESULT([no]) + NO_ICONV=YesPlease]) + LIBS="$old_LIBS"]) ++ ++GIT_UNSTASH_FLAGS($ICONVDIR) ++ + AC_SUBST(NEEDS_LIBICONV) + AC_SUBST(NO_ICONV) +-test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv" ++ + # + # Define NO_DEFLATE_BOUND if deflateBound is missing from zlib. ++ ++GIT_STASH_FLAGS($ZLIB_PATH) ++ + AC_DEFUN([ZLIBTEST_SRC], [ + #include + +@@ -387,7 +417,11 @@ AC_LINK_IFELSE(ZLIBTEST_SRC, + [AC_MSG_RESULT([no]) + NO_DEFLATE_BOUND=yes]) + LIBS="$old_LIBS" ++ ++GIT_UNSTASH_FLAGS($ZLIB_PATH) ++ + AC_SUBST(NO_DEFLATE_BOUND) ++ + # + # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, + # Patrick Mauritz). +-- +1.6.0.5 + Added: csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,30 @@ +From 9cf13a507a47de584600cd5daa5af6a9846a2d7b Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 11 Mar 2009 17:23:35 +0100 +Subject: [PATCH] configure: asciidoc version test cleanup + +Redirect stderr to /dev/null instead of stdout. This discards warnings +generated by python 2.6 related to the reorganization of functions within +modules. The warnings were causing the version detection to break. + +Signed-off-by: Ben Walton +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fe9d7eb..f4b8e49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -291,7 +291,7 @@ fi + AC_CHECK_PROGS(ASCIIDOC, [asciidoc]) + if test -n "$ASCIIDOC"; then + AC_MSG_CHECKING([for asciidoc version]) +- asciidoc_version=`$ASCIIDOC --version 2>&1` ++ asciidoc_version=`$ASCIIDOC --version 2>/dev/null` + case "${asciidoc_version}" in + asciidoc' '8*) + ASCIIDOC8=YesPlease +-- +1.6.0.5 + Added: csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,90 @@ +From 983a81ed86532d2563bbeb528f436134a6ab872e Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 11 Mar 2009 18:32:34 +0100 +Subject: [PATCH] configure: make iconv tests aware of user arguments + +--with-iconv is now taken into account when doing the tests for iconv. +If the user requests alternate handling for libiconv, the -liconv test +is run before the -lc test. + +Signed-off-by: Ben Walton +--- + configure.ac | 48 ++++++++++++++++++++++++++++++++++-------------- + 1 files changed, 34 insertions(+), 14 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f4b8e49..6fe4bfe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -375,20 +375,35 @@ int main(void) + return 0; + } + ]) +-AC_MSG_CHECKING([for iconv in -lc]) +-AC_LINK_IFELSE(ICONVTEST_SRC, ++ ++if test -n "$ICONVDIR"; then ++ lib_order="-liconv -lc" ++else ++ lib_order="-lc -liconv" ++fi ++ ++NO_ICONV=YesPlease ++ ++for l in $lib_order; do ++ if test "$l" = "-liconv"; then ++ NEEDS_LIBICONV=YesPlease ++ else ++ NEEDS_LIBICONV= ++ fi ++ ++ old_LIBS="$LIBS" ++ LIBS="$LIBS $l" ++ AC_MSG_CHECKING([for iconv in $l]) ++ AC_LINK_IFELSE(ICONVTEST_SRC, + [AC_MSG_RESULT([yes]) +- NEEDS_LIBICONV=], +- [AC_MSG_RESULT([no]) +- old_LIBS="$LIBS" +- LIBS="$LIBS -liconv" +- AC_MSG_CHECKING([for iconv in -liconv]) +- AC_LINK_IFELSE(ICONVTEST_SRC, +- [AC_MSG_RESULT([yes]) +- NEEDS_LIBICONV=YesPlease], +- [AC_MSG_RESULT([no]) +- NO_ICONV=YesPlease]) +- LIBS="$old_LIBS"]) ++ NO_ICONV= ++ break], ++ [AC_MSG_RESULT([no])]) ++ LIBS="$old_LIBS" ++done ++ ++#in case of break ++LIBS="$old_LIBS" + + GIT_UNSTASH_FLAGS($ICONVDIR) + +@@ -455,13 +470,18 @@ int main(void) + return 0; + } + ]]) ++ ++GIT_STASH_FLAGS($ICONVDIR) ++ + AC_MSG_CHECKING([for old iconv()]) + AC_COMPILE_IFELSE(OLDICONVTEST_SRC, + [AC_MSG_RESULT([no])], + [AC_MSG_RESULT([yes]) + OLD_ICONV=UnfortunatelyYes]) +-AC_SUBST(OLD_ICONV) + ++GIT_UNSTASH_FLAGS($ICONVDIR) ++ ++AC_SUBST(OLD_ICONV) + + ## Checks for typedefs, structures, and compiler characteristics. + AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) +-- +1.6.0.5 + Added: csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch 2009-03-12 19:25:06 UTC (rev 3739) @@ -0,0 +1,129 @@ +From 50df9056b97dc9d6e972e10f6948f0d6761b43b3 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 12 Mar 2009 19:45:02 +0100 +Subject: [PATCH] configure: rework pthread handling to allow for user defined flags + +The tests for POSIX threads can now be controlled by the user with the +--enable-pthreads=FLAGS option. If this is set (to some value other +than yes or no), the value is passed to the compiler. Thread support +is based solely on the outcome of this test. The user may specify not +to use threading at all or to use the default tests (first -pthread +then -lpthread) by not specifying FLAGS when passing --enable-pthreads. + +Signed-off-by: Ben Walton +--- + configure.ac | 89 ++++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 74 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6fe4bfe..4e728bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,6 +127,27 @@ if test -z "$lib"; then + lib=lib + fi + ++AC_ARG_ENABLE([pthreads], ++ [AS_HELP_STRING([--enable-pthreads=FLAGS], ++ [FLAGS is the value to pass to the compiler to enable POSIX Threads.] ++ [The default if FLAGS is not specified is to try first -pthread] ++ [and then -lpthread.] ++ [--without-pthreads will disable threading.])], ++[ ++if test "x$enableval" = "xyes"; then ++ AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads]) ++elif test "x$enableval" != "xno"; then ++ PTHREAD_CFLAGS=$enableval ++ AC_MSG_NOTICE([Setting '$PTHREAD_CFLAGS' as the FLAGS to enable POSIX Threads]) ++else ++ AC_MSG_NOTICE([POSIX Threads will be disabled.]) ++ NO_PTHREADS=YesPlease ++ USER_NOPTHREAD=1 ++fi], ++[ ++ AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads.]) ++]) ++ + ## Site configuration (override autodetection) + ## --with-PACKAGE[=ARG] and --without-PACKAGE + AC_MSG_NOTICE([CHECKS for site configuration]) +@@ -672,23 +693,61 @@ AC_SUBST(NO_MKDTEMP) + # + # Define PTHREAD_LIBS to the linker flag used for Pthread support and define + # THREADED_DELTA_SEARCH if Pthreads are available. +-AC_LANG_CONFTEST([AC_LANG_PROGRAM( +- [[#include ]], +- [[pthread_mutex_t test_mutex;]] +-)]) +-${CC} -pthread conftest.c -o conftest.o > /dev/null 2>&1 +-if test $? -eq 0;then +- PTHREAD_LIBS="-pthread" +- THREADED_DELTA_SEARCH=YesPlease ++AC_DEFUN([PTHREADTEST_SRC], [ ++#include ++ ++int main(void) ++{ ++ pthread_mutex_t test_mutex; ++ return (0); ++} ++]) ++ ++dnl AC_LANG_CONFTEST([AC_LANG_PROGRAM( ++dnl [[#include ]], ++dnl [[pthread_mutex_t test_mutex;]] ++dnl )]) ++ ++NO_PTHREADS=UnfortunatelyYes ++THREADED_DELTA_SEARCH= ++PTHREAD_LIBS= ++ ++if test -n "$USER_NOPTHREAD"; then ++ AC_MSG_NOTICE([Skipping POSIX Threads at user request.]) ++# handle these separately since PTHREAD_CFLAGS could be '-lpthreads ++# -D_REENTRANT' or some such. ++elif test -z "$PTHREAD_CFLAGS"; then ++ for opt in -pthread -lpthread; do ++ old_CFLAGS="$CFLAGS" ++ CFLAGS="$opt $CFLAGS" ++ AC_MSG_CHECKING([Checking for POSIX Threads with '$opt']) ++ AC_LINK_IFELSE(PTHREADTEST_SRC, ++ [AC_MSG_RESULT([yes]) ++ NO_PTHREADS= ++ PTHREAD_LIBS="$opt" ++ THREADED_DELTA_SEARCH=YesPlease ++ break ++ ], ++ [AC_MSG_RESULT([no])]) ++ CFLAGS="$old_CFLAGS" ++ done + else +- ${CC} -lpthread conftest.c -o conftest.o > /dev/null 2>&1 +- if test $? -eq 0;then +- PTHREAD_LIBS="-lpthread" +- THREADED_DELTA_SEARCH=YesPlease +- else +- NO_PTHREADS=UnfortunatelyYes +- fi ++ old_CFLAGS="$CFLAGS" ++ CFLAGS="$PTHREAD_CFLAGS $CFLAGS" ++ AC_MSG_CHECKING([Checking for POSIX Threads with '$PTHREAD_CFLAGS']) ++ AC_LINK_IFELSE(PTHREADTEST_SRC, ++ [AC_MSG_RESULT([yes]) ++ NO_PTHREADS= ++ PTHREAD_LIBS="$PTHREAD_CFLAGS" ++ THREADED_DELTA_SEARCH=YesPlease ++ ], ++ [AC_MSG_RESULT([no])]) ++ ++ CFLAGS="$old_CFLAGS" + fi ++ ++CFLAGS="$old_CFLAGS" ++ + AC_SUBST(PTHREAD_LIBS) + AC_SUBST(NO_PTHREADS) + AC_SUBST(THREADED_DELTA_SEARCH) +-- +1.6.0.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 13 13:27:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Mar 2009 12:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[3740] csw/mgar/pkg/flex_new/trunk/Makefile Message-ID: Revision: 3740 http://gar.svn.sourceforge.net/gar/?rev=3740&view=rev Author: dmichelsen Date: 2009-03-13 12:27:28 +0000 (Fri, 13 Mar 2009) Log Message: ----------- flex_new: Update post-install to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/flex_new/trunk/Makefile Modified: csw/mgar/pkg/flex_new/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex_new/trunk/Makefile 2009-03-12 19:25:06 UTC (rev 3739) +++ csw/mgar/pkg/flex_new/trunk/Makefile 2009-03-13 12:27:28 UTC (rev 3740) @@ -32,7 +32,7 @@ # Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff TEST_ENV += PATH=$(prefix)/gnu:$(PATH) -post-install: +post-install-modulated: @mkdir -p $(DESTDIR)$(bindir) @gln -sf ../libexec/$(GARNAME)-$(GARVERSION)/bin/flex $(DESTDIR)$(bindir)/newflex @gln -sf ../libexec/$(GARNAME)-$(GARVERSION)/bin/flex $(DESTDIR)$(bindir)/flex-$(GARVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Mar 13 13:29:48 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 13 Mar 2009 12:29:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3741] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 3741 http://gar.svn.sourceforge.net/gar/?rev=3741&view=rev Author: idogan23 Date: 2009-03-13 12:29:48 +0000 (Fri, 13 Mar 2009) Log Message: ----------- unbound: fixed dependencies mistake Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-03-13 12:27:28 UTC (rev 3740) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-03-13 12:29:48 UTC (rev 3741) @@ -17,12 +17,11 @@ GARCOMPILER = GCC4 -REQUIRED_PKGS = CSWcswclassutils SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/unbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES @@ -34,7 +33,7 @@ CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw -REQUIRED_PKGS = CSWosslrt CSWgcc4corert +REQUIRED_PKGS = CSWosslrt CSWgcc4corert CSWcswclassutils post-install-modulated: @ginstall -d $(DESTDIR)/etc/opt/csw/init.d This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 13 15:06:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Mar 2009 14:06:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[3742] csw/mgar/pkg/leafnode/trunk Message-ID: Revision: 3742 http://gar.svn.sourceforge.net/gar/?rev=3742&view=rev Author: dmichelsen Date: 2009-03-13 14:06:49 +0000 (Fri, 13 Mar 2009) Log Message: ----------- leafnode: Switch to dynamic gspec and depend on CSWpcrert Modified Paths: -------------- csw/mgar/pkg/leafnode/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/leafnode/trunk/files/CSWleafnode.gspec Modified: csw/mgar/pkg/leafnode/trunk/Makefile =================================================================== --- csw/mgar/pkg/leafnode/trunk/Makefile 2009-03-13 12:29:48 UTC (rev 3741) +++ csw/mgar/pkg/leafnode/trunk/Makefile 2009-03-13 14:06:49 UTC (rev 3742) @@ -8,13 +8,12 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWleafnode,) UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=57767 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -REQUIRED_PKGS = CSWpcre +REQUIRED_PKGS = CSWpcrert CONFIGURE_ARGS = $(DIRPATHS) Deleted: csw/mgar/pkg/leafnode/trunk/files/CSWleafnode.gspec =================================================================== --- csw/mgar/pkg/leafnode/trunk/files/CSWleafnode.gspec 2009-03-13 12:29:48 UTC (rev 3741) +++ csw/mgar/pkg/leafnode/trunk/files/CSWleafnode.gspec 2009-03-13 14:06:49 UTC (rev 3742) @@ -1,4 +0,0 @@ -%var bitname leafnode -%var pkgname CSWleafnode -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Mar 13 15:58:00 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Mar 2009 14:58:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[3743] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 3743 http://gar.svn.sourceforge.net/gar/?rev=3743&view=rev Author: bonivart Date: 2009-03-13 14:58:00 +0000 (Fri, 13 Mar 2009) Log Message: ----------- pkgutil: update to 1.5b2 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-03-13 14:06:49 UTC (rev 3742) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-03-13 14:58:00 UTC (rev 3743) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.4 +GARVERSION = 1.5b2 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -10,7 +10,8 @@ package automatically. endef -MASTER_SITES = http://www.bonivart.com/pkgutil/ +#MASTER_SITES = http://www.bonivart.com/pkgutil/ +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) @@ -38,13 +39,13 @@ @ginstall -d $(DESTDIR)$(mandir)/man1 # @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages -# @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @ginstall -d $(DESTDIR)/etc/opt/csw @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) @cp -r $(WORKSRC)/bldcat $(DESTDIR)$(bindir) @cp -r $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @cp -r $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ -# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE @cp -r $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)/ # @cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-03-13 14:06:49 UTC (rev 3742) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-03-13 14:58:00 UTC (rev 3743) @@ -1,5 +1,5 @@ -e747b0e510c2d4a662228f7e150a9a76 download/pkgutil-1.4.zip +1b273bbe099ff9fff53effeda50d3af7 download/pkgutil-1.5b2.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec -2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype -b9a3a99ece73247e0dbcbb8ea448fcba download/CSWpkgutil.postinstall -6905ca210b32f0789c8640c32de44911 download/CSWpkgutil.preremove +54bd1af1cd6ca5ac7e63586ffc16842d download/CSWpkgutil.prototype +e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall +2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2009-03-13 14:06:49 UTC (rev 3742) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2009-03-13 14:58:00 UTC (rev 3743) @@ -1,16 +1,23 @@ #!/bin/sh -ETC=$PKG_INSTALL_ROOT/opt/csw/etc +ETC1=$PKG_INSTALL_ROOT/opt/csw/etc +ETC2=$PKG_INSTALL_ROOT/etc/opt/csw VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil echo -if [ ! -f "$ETC/pkgutil.conf" ]; then - cp -p $ETC/pkgutil.conf.CSW $ETC/pkgutil.conf +if [ ! -f "$ETC1/pkgutil.conf" ]; then + cp -p $ETC1/pkgutil.conf.CSW $ETC1/pkgutil.conf else echo "pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it." fi +if [ ! -f "$ETC2/pkgutil.conf" ]; then + cp -p $ETC2/pkgutil.conf.CSW $ETC2/pkgutil.conf +else + echo "pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it." +fi + if [ ! -f "$VAR/admin" ]; then cp -p $VAR/admin.CSW $VAR/admin else Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2009-03-13 14:06:49 UTC (rev 3742) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2009-03-13 14:58:00 UTC (rev 3743) @@ -1,16 +1,23 @@ #!/bin/sh -ETC=$PKG_INSTALL_ROOT/opt/csw/etc +ETC1=$PKG_INSTALL_ROOT/opt/csw/etc +ETC2=$PKG_INSTALL_ROOT/etc/opt/csw VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil echo -if [ "`cmp "$ETC/pkgutil.conf" "$ETC/pkgutil.conf.CSW"`" ]; then +if [ "`cmp "$ETC1/pkgutil.conf" "$ETC1/pkgutil.conf.CSW"`" ]; then echo "pkgutil.conf modified, will not remove it." else - /bin/rm $ETC/pkgutil.conf + /bin/rm $ETC1/pkgutil.conf fi +if [ "`cmp "$ETC2/pkgutil.conf" "$ETC2/pkgutil.conf.CSW"`" ]; then + echo "pkgutil.conf modified, will not remove it." +else + /bin/rm $ETC2/pkgutil.conf +fi + if [ "`cmp "$VAR/admin" "$VAR/admin.CSW"`" ]; then echo "admin modified, will not remove it." else Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-03-13 14:06:49 UTC (rev 3742) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-03-13 14:58:00 UTC (rev 3743) @@ -2,6 +2,8 @@ i copyright=CSWpkgutil.copyright i postinstall=CSWpkgutil.postinstall i preremove=CSWpkgutil.preremove +d none /etc/opt/csw 0755 root bin +f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 13 16:09:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Mar 2009 15:09:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[3744] csw/mgar/pkg/libvorbis/trunk Message-ID: Revision: 3744 http://gar.svn.sourceforge.net/gar/?rev=3744&view=rev Author: dmichelsen Date: 2009-03-13 15:09:30 +0000 (Fri, 13 Mar 2009) Log Message: ----------- libvorbis: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.depend csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.gspec Property Changed: ---------------- csw/mgar/pkg/libvorbis/trunk/ Property changes on: csw/mgar/pkg/libvorbis/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2009-03-13 14:58:00 UTC (rev 3743) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2009-03-13 15:09:30 UTC (rev 3744) @@ -11,13 +11,16 @@ MASTER_SITES = http://downloads.xiph.org/releases/vorbis/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibvorbis,depend) +REQUIRED_PKGS = CSWlibogg + +SPKG_SOURCEURL = http://www.vorbis.com/ + +BUILD64 = 1 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -LIBDEPS += lib/libogg - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libvorbis/trunk/checksums =================================================================== --- csw/mgar/pkg/libvorbis/trunk/checksums 2009-03-13 14:58:00 UTC (rev 3743) +++ csw/mgar/pkg/libvorbis/trunk/checksums 2009-03-13 15:09:30 UTC (rev 3744) @@ -1,3 +1 @@ 478646358c49f34aedcce58948793619 download/libvorbis-1.2.0.tar.gz -366c0e098a0935507279fa052173cfc1 download/CSWlibvorbis.gspec -cfe61719dd516afb0607fc54e017f08a download/CSWlibvorbis.depend Deleted: csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.depend =================================================================== --- csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.depend 2009-03-13 14:58:00 UTC (rev 3743) +++ csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.depend 2009-03-13 15:09:30 UTC (rev 3744) @@ -1 +0,0 @@ -P CSWlibogg libogg - Ogg bitstream and framing library. Deleted: csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.gspec =================================================================== --- csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.gspec 2009-03-13 14:58:00 UTC (rev 3743) +++ csw/mgar/pkg/libvorbis/trunk/files/CSWlibvorbis.gspec 2009-03-13 15:09:30 UTC (rev 3744) @@ -1,4 +0,0 @@ -%var bitname libvorbis -%var pkgname CSWlibvorbis -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 13 16:10:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Mar 2009 15:10:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3745] csw/mgar/pkg/libart/trunk Message-ID: Revision: 3745 http://gar.svn.sourceforge.net/gar/?rev=3745&view=rev Author: dmichelsen Date: 2009-03-13 15:10:16 +0000 (Fri, 13 Mar 2009) Log Message: ----------- libart: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libart/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libart/trunk/files/CSWlibart.gspec Property Changed: ---------------- csw/mgar/pkg/libart/trunk/ Property changes on: csw/mgar/pkg/libart/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libart/trunk/Makefile 2009-03-13 15:09:30 UTC (rev 3744) +++ csw/mgar/pkg/libart/trunk/Makefile 2009-03-13 15:10:16 UTC (rev 3745) @@ -14,87 +14,19 @@ development. endef -sparc_ARCH = sparc -i386_ARCH = i386 -sparc_ARCH64 = sparcv9 -i386_ARCH64 = amd64 - -ARCH=$($(GARCH)_ARCH) -ARCH64=$($(GARCH)_ARCH64) - -ifndef DO64 -MM=32 -else -MM=64 -endif - -ifdef ISA -ISALIST = $(ISA) -else -ifndef DO64 -ISA = $(ARCH) -else -ISA = $(ARCH64) -endif -endif - MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibart) +PACKAGES = CSWlibart + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(ISA) -COOKIEROOTDIR = cookies.$(ISA) -COOKIEDIR = $(COOKIEROOTDIR) +BUILD64 = 1 -## For x86 ## -# for x86, we must share cookie work dir between sol10 and sol8 -# so we make them arch-dependant instead of hostname dependant -DESTIMG = $(LOGNAME)-$(GARCH) -# we also make the target build directory (which looks like build.$(GAROSREL)-$(GARCH)) -# identical between sol10 and sol8 by forcing the OS name used -GAROSREL = 5.8 -# we force the OS for pkginfo, pkg filename so the final package step -# performed on solaris 10 x86 really produce SunOS5.8 labelled packages. -SPKG_OSNAME = SunOS5.8 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static -# Optimizer flags for architecture -OPTARCH_sparc = v8 -OPTARCH_sparcv9 = v9 -OPTARCH_i386 = 386 -OPTARCH_amd64 = amd64 +TEST_TARGET = check -CLEAN_SCRIPTS = custom - -ifdef DO64 - bindir = $(exec_prefix)/bin/$(ISA) - libdir = $(exec_prefix)/lib/$(ISA) -endif - include gar/category.mk - -TEST_TARGET = - -OPTARCH = $(OPTARCH_$(ISA)) - -build64: - @echo " ==> Building 64 bit version" - gmake DO64=1 build - $(MAKECOOKIE) - -install64: build64 - @echo " ==> Installing 64 bit version" - gmake DO64=1 install - $(MAKECOOKIE) - -pre-package: install64 - -clean64: - gmake DO64=1 clean-all - -clean-custom: clean64 clean-all Deleted: csw/mgar/pkg/libart/trunk/files/CSWlibart.gspec =================================================================== --- csw/mgar/pkg/libart/trunk/files/CSWlibart.gspec 2009-03-13 15:09:30 UTC (rev 3744) +++ csw/mgar/pkg/libart/trunk/files/CSWlibart.gspec 2009-03-13 15:10:16 UTC (rev 3745) @@ -1,4 +0,0 @@ -%var bitname libart -%var pkgname CSWlibart -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Mar 13 16:43:50 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 13 Mar 2009 15:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[3746] csw/mgar/pkg/hatari/trunk Message-ID: Revision: 3746 http://gar.svn.sourceforge.net/gar/?rev=3746&view=rev Author: jake_goerzen Date: 2009-03-13 15:43:50 +0000 (Fri, 13 Mar 2009) Log Message: ----------- add CSWhatari.depend CSWhatari.gspec files Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2009-03-13 15:10:16 UTC (rev 3745) +++ csw/mgar/pkg/hatari/trunk/Makefile 2009-03-13 15:43:50 UTC (rev 3746) @@ -9,17 +9,21 @@ MASTER_SITES = http://download.berlios.de/hatari/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWhatari,) +DISTFILES += $(call admfiles,CSWhatari, depend ) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +# NOTE: before building replace stdint.h -> sys/types.h in file src/int.c & src/uae-cpu/sysdeps.h At final link stage linker cannot find -lpng -lreadline force it with LD_OPTIONS=-L/opt/csw/lib gmake build need to make patch. + +LICENSE = gpl.txt + GARCOMPILER = GNU - +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Added: csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend =================================================================== --- csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend (rev 0) +++ csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend 2009-03-13 15:43:50 UTC (rev 3746) @@ -0,0 +1,4 @@ +P CSWlibsdl +P CSWpng +P CSWreadline +P CSWzlib Added: csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec =================================================================== --- csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec (rev 0) +++ csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec 2009-03-13 15:43:50 UTC (rev 3746) @@ -0,0 +1,4 @@ +%var bitname hatari +%var pkgname CSWhatari +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/gpl.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 13 16:51:54 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Mar 2009 15:51:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[3747] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 3747 http://gar.svn.sourceforge.net/gar/?rev=3747&view=rev Author: dmichelsen Date: 2009-03-13 15:51:54 +0000 (Fri, 13 Mar 2009) Log Message: ----------- msmtp: Move to mGAR v2 and depend on CSWgettextrt Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2009-03-13 15:43:50 UTC (rev 3746) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2009-03-13 15:51:54 UTC (rev 3747) @@ -24,14 +24,15 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWmsmtp) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -REQUIRED_PKGS = CSWgcrypt CSWggettext CSWgnutls CSWgpgerr CSWiconv CSWkrb5lib +REQUIRED_PKGS = CSWgcrypt CSWggettextrt CSWgnutls CSWgpgerr CSWiconv CSWkrb5lib REQUIRED_PKGS += CSWlibgsasl CSWlibidn CSWlibntlm CSWzlib +RUNPATHQUOTE = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Deleted: csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec =================================================================== --- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec 2009-03-13 15:43:50 UTC (rev 3746) +++ csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec 2009-03-13 15:51:54 UTC (rev 3747) @@ -1,4 +0,0 @@ -%var bitname msmtp -%var pkgname CSWmsmtp -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 13 17:03:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Mar 2009 16:03:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[3748] csw/mgar/pkg/flac/trunk Message-ID: Revision: 3748 http://gar.svn.sourceforge.net/gar/?rev=3748&view=rev Author: dmichelsen Date: 2009-03-13 16:03:33 +0000 (Fri, 13 Mar 2009) Log Message: ----------- libflac: Add 64 bit patch for libtool Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/flac/trunk/checksums Added Paths: ----------- csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-03-13 15:51:54 UTC (rev 3747) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-03-13 16:03:33 UTC (rev 3748) @@ -18,6 +18,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = no-stdint.patch +PATCHFILES += libtool-64bit.patch CATALOGNAME = libflac Modified: csw/mgar/pkg/flac/trunk/checksums =================================================================== --- csw/mgar/pkg/flac/trunk/checksums 2009-03-13 15:51:54 UTC (rev 3747) +++ csw/mgar/pkg/flac/trunk/checksums 2009-03-13 16:03:33 UTC (rev 3748) @@ -1,2 +1,3 @@ 153c8b15a54da428d1f0fadc756c22c7 download/flac-1.2.1.tar.gz e3144fad8810ceaca718adb6f09dc8fa download/no-stdint.patch +099621e0dad419188acd42c588242131 download/libtool-64bit.patch Added: csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch (rev 0) +++ csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch 2009-03-13 16:03:33 UTC (rev 3748) @@ -0,0 +1,13 @@ +diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh +--- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 ++++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 +@@ -1552,9 +1552,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi + continue + ;; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 13 17:34:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 13 Mar 2009 16:34:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3749] csw/mgar/pkg Message-ID: Revision: 3749 http://gar.svn.sourceforge.net/gar/?rev=3749&view=rev Author: valholla Date: 2009-03-13 16:34:52 +0000 (Fri, 13 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/pycairo/ csw/mgar/pkg/pycairo/Makefile csw/mgar/pkg/pycairo/branches/ csw/mgar/pkg/pycairo/tags/ csw/mgar/pkg/pycairo/trunk/ csw/mgar/pkg/pycairo/trunk/Makefile csw/mgar/pkg/pycairo/trunk/files/ Added: csw/mgar/pkg/pycairo/Makefile =================================================================== --- csw/mgar/pkg/pycairo/Makefile (rev 0) +++ csw/mgar/pkg/pycairo/Makefile 2009-03-13 16:34:52 UTC (rev 3749) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/pycairo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pycairo/trunk/Makefile 2009-03-13 16:34:52 UTC (rev 3749) @@ -0,0 +1,34 @@ +GARNAME = pycairo +GARVERSION = 1.8.2 +CATEGORIES = lang + +DESCRIPTION = pycairo support for Python +define BLURB + This is a Python language binding for cairo. +endef + +MASTER_SITES = http://www.cairographics.org/releases/ +SPKG_SOURCEURL = http://www.cairographics.org +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += fixme.sh + +PACKAGES = CSWpycairo +REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 + +CATALOGNAME_CSWpycairo = pycairo +SPKG_DESC_CSWpycairo = $(DESCRIPTION) + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-configure-$(MODULATION): + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 13 17:43:18 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 13 Mar 2009 16:43:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3750] csw/mgar/pkg Message-ID: Revision: 3750 http://gar.svn.sourceforge.net/gar/?rev=3750&view=rev Author: valholla Date: 2009-03-13 16:43:17 +0000 (Fri, 13 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/cairo/ csw/mgar/pkg/cairo/Makefile csw/mgar/pkg/cairo/branches/ csw/mgar/pkg/cairo/tags/ csw/mgar/pkg/cairo/trunk/ csw/mgar/pkg/cairo/trunk/Makefile csw/mgar/pkg/cairo/trunk/files/ csw/mgar/pkg/cairomm/ csw/mgar/pkg/cairomm/Makefile csw/mgar/pkg/cairomm/branches/ csw/mgar/pkg/cairomm/tags/ csw/mgar/pkg/cairomm/trunk/ csw/mgar/pkg/cairomm/trunk/Makefile csw/mgar/pkg/cairomm/trunk/files/ csw/mgar/pkg/rcairo/ csw/mgar/pkg/rcairo/Makefile csw/mgar/pkg/rcairo/branches/ csw/mgar/pkg/rcairo/tags/ csw/mgar/pkg/rcairo/trunk/ csw/mgar/pkg/rcairo/trunk/Makefile csw/mgar/pkg/rcairo/trunk/files/ Added: csw/mgar/pkg/cairo/Makefile =================================================================== --- csw/mgar/pkg/cairo/Makefile (rev 0) +++ csw/mgar/pkg/cairo/Makefile 2009-03-13 16:43:17 UTC (rev 3750) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/cairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/cairo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cairo/trunk/Makefile 2009-03-13 16:43:17 UTC (rev 3750) @@ -0,0 +1,34 @@ +GARNAME = pycairo +GARVERSION = 1.8.2 +CATEGORIES = lang + +DESCRIPTION = pycairo support for Python +define BLURB + This is a Python language binding for cairo. +endef + +MASTER_SITES = http://www.cairographics.org/releases/ +SPKG_SOURCEURL = http://www.cairographics.org +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += fixme.sh + +PACKAGES = CSWpycairo +REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 + +CATALOGNAME_CSWpycairo = pycairo +SPKG_DESC_CSWpycairo = $(DESCRIPTION) + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-configure-$(MODULATION): + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) Added: csw/mgar/pkg/cairomm/Makefile =================================================================== --- csw/mgar/pkg/cairomm/Makefile (rev 0) +++ csw/mgar/pkg/cairomm/Makefile 2009-03-13 16:43:17 UTC (rev 3750) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/cairomm/trunk/Makefile =================================================================== --- csw/mgar/pkg/cairomm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cairomm/trunk/Makefile 2009-03-13 16:43:17 UTC (rev 3750) @@ -0,0 +1,34 @@ +GARNAME = pycairo +GARVERSION = 1.8.2 +CATEGORIES = lang + +DESCRIPTION = pycairo support for Python +define BLURB + This is a Python language binding for cairo. +endef + +MASTER_SITES = http://www.cairographics.org/releases/ +SPKG_SOURCEURL = http://www.cairographics.org +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += fixme.sh + +PACKAGES = CSWpycairo +REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 + +CATALOGNAME_CSWpycairo = pycairo +SPKG_DESC_CSWpycairo = $(DESCRIPTION) + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-configure-$(MODULATION): + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) Added: csw/mgar/pkg/rcairo/Makefile =================================================================== --- csw/mgar/pkg/rcairo/Makefile (rev 0) +++ csw/mgar/pkg/rcairo/Makefile 2009-03-13 16:43:17 UTC (rev 3750) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/rcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcairo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rcairo/trunk/Makefile 2009-03-13 16:43:17 UTC (rev 3750) @@ -0,0 +1,34 @@ +GARNAME = pycairo +GARVERSION = 1.8.2 +CATEGORIES = lang + +DESCRIPTION = pycairo support for Python +define BLURB + This is a Python language binding for cairo. +endef + +MASTER_SITES = http://www.cairographics.org/releases/ +SPKG_SOURCEURL = http://www.cairographics.org +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += fixme.sh + +PACKAGES = CSWpycairo +REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 + +CATALOGNAME_CSWpycairo = pycairo +SPKG_DESC_CSWpycairo = $(DESCRIPTION) + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +post-configure-$(MODULATION): + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 13 18:29:58 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 13 Mar 2009 17:29:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3751] csw/mgar/pkg/cairo/ Message-ID: Revision: 3751 http://gar.svn.sourceforge.net/gar/?rev=3751&view=rev Author: valholla Date: 2009-03-13 17:29:58 +0000 (Fri, 13 Mar 2009) Log Message: ----------- remove cairo, duplicate of libcairo Removed Paths: ------------- csw/mgar/pkg/cairo/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Mar 13 18:35:04 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 13 Mar 2009 17:35:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[3752] csw/mgar/pkg Message-ID: Revision: 3752 http://gar.svn.sourceforge.net/gar/?rev=3752&view=rev Author: valholla Date: 2009-03-13 17:35:03 +0000 (Fri, 13 Mar 2009) Log Message: ----------- basic gar v2 setup Modified Paths: -------------- csw/mgar/pkg/cairomm/trunk/Makefile csw/mgar/pkg/pycairo/trunk/Makefile csw/mgar/pkg/rcairo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cairomm/trunk/checksums csw/mgar/pkg/pycairo/trunk/checksums csw/mgar/pkg/rcairo/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cairomm/trunk/ csw/mgar/pkg/pycairo/trunk/ csw/mgar/pkg/rcairo/trunk/ Property changes on: csw/mgar/pkg/cairomm/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cairomm/trunk/Makefile =================================================================== --- csw/mgar/pkg/cairomm/trunk/Makefile 2009-03-13 17:29:58 UTC (rev 3751) +++ csw/mgar/pkg/cairomm/trunk/Makefile 2009-03-13 17:35:03 UTC (rev 3752) @@ -1,34 +1,32 @@ -GARNAME = pycairo -GARVERSION = 1.8.2 -CATEGORIES = lang +GARNAME = cairomm +GARVERSION = 1.8.0 +CATEGORIES = lib -DESCRIPTION = pycairo support for Python +DESCRIPTION = C++ bindings for Cairo define BLURB - This is a Python language binding for cairo. endef -MASTER_SITES = http://www.cairographics.org/releases/ -SPKG_SOURCEURL = http://www.cairographics.org -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += fixme.sh +MASTER_SITES = http://www.cairographics.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWpycairo -REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 - -CATALOGNAME_CSWpycairo = pycairo -SPKG_DESC_CSWpycairo = $(DESCRIPTION) - # We define upstream file regex so we can be notifed of # new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES = CSWcairomm CSWcairomm-devel +SPKG_DESC_CSWcairomm = $(DESCRIPTION) +SPKG_DESC_CSWcairomm-devel = $(DESCRIPTION) development package -TEST_TARGET = check +PKGFILES_CSWcairomm-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWcairomm-devel += $(prefix)/include/.* +PKGFILES_CSWcairomm-devel += $(prefix)/lib/.*\.a +PKGFILES_CSWcairomm-devel += $(prefix)/lib/pkgconfig/.* +REQUIRED_PKGS_CSWcairomm-devel = CSWcairomm + +CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk -post-configure-$(MODULATION): - @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) + Added: csw/mgar/pkg/cairomm/trunk/checksums =================================================================== --- csw/mgar/pkg/cairomm/trunk/checksums (rev 0) +++ csw/mgar/pkg/cairomm/trunk/checksums 2009-03-13 17:35:03 UTC (rev 3752) @@ -0,0 +1 @@ +15c0f56eee57bb418c38463a6297d715 download/cairomm-1.8.0.tar.gz Property changes on: csw/mgar/pkg/pycairo/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/pycairo/trunk/Makefile 2009-03-13 17:29:58 UTC (rev 3751) +++ csw/mgar/pkg/pycairo/trunk/Makefile 2009-03-13 17:35:03 UTC (rev 3752) @@ -1,34 +1,32 @@ -GARNAME = pycairo -GARVERSION = 1.8.2 -CATEGORIES = lang +GARNAME = pycairo +GARVERSION = 1.8.0 +CATEGORIES = lib -DESCRIPTION = pycairo support for Python +DESCRIPTION = Python Bindings for Cairo define BLURB - This is a Python language binding for cairo. endef -MASTER_SITES = http://www.cairographics.org/releases/ -SPKG_SOURCEURL = http://www.cairographics.org -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += fixme.sh +MASTER_SITES = http://www.cairographics.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWpycairo -REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 - -CATALOGNAME_CSWpycairo = pycairo -SPKG_DESC_CSWpycairo = $(DESCRIPTION) - # We define upstream file regex so we can be notifed of # new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpycairo CSWpycairo-devel -CONFIGURE_ARGS = $(DIRPATHS) +SPKG_DESC_CSWpycairo = $(DESCRIPTION) +SPKG_DESC_CSWpycairo-devel = $(DESCRIPTION) development package -TEST_TARGET = check +PKGFILES_CSWpycairo-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWpycairo-devel += $(prefix)/include/.* +PKGFILES_CSWpycairo-devel += $(prefix)/lib/.*\.a +PKGFILES_CSWpycairo-devel += $(prefix)/lib/pkgconfig/.* +REQUIRED_PKGS_CSWpycairo-devel = CSWpycairo + +CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk -post-configure-$(MODULATION): - @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) + Added: csw/mgar/pkg/pycairo/trunk/checksums =================================================================== --- csw/mgar/pkg/pycairo/trunk/checksums (rev 0) +++ csw/mgar/pkg/pycairo/trunk/checksums 2009-03-13 17:35:03 UTC (rev 3752) @@ -0,0 +1 @@ +847f5377c32228a656819f5bd18eb6b4 download/pycairo-1.8.0.tar.gz Property changes on: csw/mgar/pkg/rcairo/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/rcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcairo/trunk/Makefile 2009-03-13 17:29:58 UTC (rev 3751) +++ csw/mgar/pkg/rcairo/trunk/Makefile 2009-03-13 17:35:03 UTC (rev 3752) @@ -1,34 +1,32 @@ -GARNAME = pycairo -GARVERSION = 1.8.2 -CATEGORIES = lang +GARNAME = rcairo +GARVERSION = 1.8.0 +CATEGORIES = lib -DESCRIPTION = pycairo support for Python +DESCRIPTION = Ruby Bindings for Cairo define BLURB - This is a Python language binding for cairo. endef -MASTER_SITES = http://www.cairographics.org/releases/ -SPKG_SOURCEURL = http://www.cairographics.org -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += fixme.sh +MASTER_SITES = http://www.cairographics.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWpycairo -REQUIRED_PKGS_CSWpycairo = CSWpython CSWggettextrt CSWglib2 - -CATALOGNAME_CSWpycairo = pycairo -SPKG_DESC_CSWpycairo = $(DESCRIPTION) - # We define upstream file regex so we can be notifed of # new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWrcairo CSWrcairo-devel -CONFIGURE_ARGS = $(DIRPATHS) +SPKG_DESC_CSWrcairo = $(DESCRIPTION) +SPKG_DESC_CSWrcairo-devel = $(DESCRIPTION) development package -TEST_TARGET = check +PKGFILES_CSWrcairo-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWrcairo-devel += $(prefix)/include/.* +PKGFILES_CSWrcairo-devel += $(prefix)/lib/.*\.a +PKGFILES_CSWrcairo-devel += $(prefix)/lib/pkgconfig/.* +REQUIRED_PKGS_CSWrcairo-devel = CSWrcairo + +CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk -post-configure-$(MODULATION): - @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) + Added: csw/mgar/pkg/rcairo/trunk/checksums =================================================================== --- csw/mgar/pkg/rcairo/trunk/checksums (rev 0) +++ csw/mgar/pkg/rcairo/trunk/checksums 2009-03-13 17:35:03 UTC (rev 3752) @@ -0,0 +1 @@ +7ea9f0b174d379c6a0374f534c2a4e85 download/rcairo-1.8.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Mar 13 18:46:10 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 13 Mar 2009 17:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[3753] csw/mgar/pkg/hatari/trunk/checksums Message-ID: Revision: 3753 http://gar.svn.sourceforge.net/gar/?rev=3753&view=rev Author: jake_goerzen Date: 2009-03-13 17:46:09 +0000 (Fri, 13 Mar 2009) Log Message: ----------- add checksums Added Paths: ----------- csw/mgar/pkg/hatari/trunk/checksums Added: csw/mgar/pkg/hatari/trunk/checksums =================================================================== --- csw/mgar/pkg/hatari/trunk/checksums (rev 0) +++ csw/mgar/pkg/hatari/trunk/checksums 2009-03-13 17:46:09 UTC (rev 3753) @@ -0,0 +1,3 @@ +4aecd42784fae8c5e8c9a9a341146fbb download/hatari-1.2.0.tar.bz2 +1f74fc77f3c0664cdd49e2c9cba3fe2d download/CSWhatari.gspec +c9dda36e1f7a79cf0c8b65d3503fdc5d download/CSWhatari.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Mar 13 20:26:32 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 13 Mar 2009 19:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3754] csw/mgar/pkg/nagios/trunk/Makefile Message-ID: Revision: 3754 http://gar.svn.sourceforge.net/gar/?rev=3754&view=rev Author: j_arndt Date: 2009-03-13 19:26:32 +0000 (Fri, 13 Mar 2009) Log Message: ----------- nagios: switched dependency from CSWapache to CSWapache2 Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-03-13 17:46:09 UTC (rev 3753) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-03-13 19:26:32 UTC (rev 3754) @@ -21,7 +21,7 @@ PATCHFILES += install-opts.diff # sets in every Makefile.in "INSTALL_OPT="" (empty) # necessary, so ginstall doesn't get -o and -g options -REQUIRED_PKGS_CSWnagios = CSWapache CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt +REQUIRED_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin CSWcswclassutils SPKG_CLASSES = none cswinitsmf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 13 21:02:30 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 13 Mar 2009 20:02:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[3755] csw/mgar/pkg/cvsps/trunk Message-ID: Revision: 3755 http://gar.svn.sourceforge.net/gar/?rev=3755&view=rev Author: bdwalton Date: 2009-03-13 20:02:25 +0000 (Fri, 13 Mar 2009) Log Message: ----------- Replace %z in strftime call with +0000 as all times are GMT based (in this use anyway). Modified Paths: -------------- csw/mgar/pkg/cvsps/trunk/Makefile csw/mgar/pkg/cvsps/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cvsps/trunk/files/0008-Replace-z-use-in-strftime.patch Modified: csw/mgar/pkg/cvsps/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsps/trunk/Makefile 2009-03-13 19:26:32 UTC (rev 3754) +++ csw/mgar/pkg/cvsps/trunk/Makefile 2009-03-13 20:02:25 UTC (rev 3755) @@ -17,6 +17,7 @@ PATCHFILES += 0005-gnulib-import-of-missing-functions.patch PATCHFILES += 0006-enabled-imported-gnulib-functions.patch PATCHFILES += 0007-enable-installation-of-man-pages.patch +PATCHFILES += 0008-Replace-z-use-in-strftime.patch PREREQUISITE_PKGS = CSWzlib CSWautomake CSWautoconf @@ -27,7 +28,7 @@ LICENSE = COPYING # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = Modified: csw/mgar/pkg/cvsps/trunk/checksums =================================================================== --- csw/mgar/pkg/cvsps/trunk/checksums 2009-03-13 19:26:32 UTC (rev 3754) +++ csw/mgar/pkg/cvsps/trunk/checksums 2009-03-13 20:02:25 UTC (rev 3755) @@ -1,5 +1,4 @@ bde2110ed9f5d14de8f8cb04e9d596fe download/cvsps-2.1.tar.gz -cb54db01900320e1bf80da166c60c2f8 download/CSWcvsps.gspec f1980fbc932203a048a6e5c3cfa1af5b download/0001-add-basic-autotools-files.patch 85b73079daeef9d87b637939e3749489 download/0002-add-modified-autoconf-check_zlib-from-loic-dachary.patch f5d84b7c7a05a44f64f740006df5c349 download/0003-add-script-to-do-the-autotools-setup-steps.patch @@ -7,3 +6,4 @@ 58cbd19160b6a98f3c5ff2a8786f0848 download/0005-gnulib-import-of-missing-functions.patch 02c14b029fd57a61fa97cc8209f18d7d download/0006-enabled-imported-gnulib-functions.patch 2a729989bcafa6f533bcd6b33c9ceb09 download/0007-enable-installation-of-man-pages.patch +2410e2c909bf1635aad8d84f6e5bdc4f download/0008-Replace-z-use-in-strftime.patch Added: csw/mgar/pkg/cvsps/trunk/files/0008-Replace-z-use-in-strftime.patch =================================================================== --- csw/mgar/pkg/cvsps/trunk/files/0008-Replace-z-use-in-strftime.patch (rev 0) +++ csw/mgar/pkg/cvsps/trunk/files/0008-Replace-z-use-in-strftime.patch 2009-03-13 20:02:25 UTC (rev 3755) @@ -0,0 +1,27 @@ +From 5dd229a8918e73a09a8e7796687d20f5c7324b40 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 13 Mar 2009 20:47:32 +0100 +Subject: [PATCH] Replace %z use in strftime + +Since the strftime calls that use %z always work with GMT, simply +replace %z with +0000. +--- + cvsps.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/cvsps.c b/cvsps.c +index 4f49f22..7291c5a 100644 +--- a/cvsps.c ++++ b/cvsps.c +@@ -291,7 +291,7 @@ static void load_from_cvs() + if (cache_date > 0) + { + struct tm * tm = gmtime(&cache_date); +- strftime(date_str, 64, "%d %b %Y %H:%M:%S %z", tm); ++ strftime(date_str, 64, "%d %b %Y %H:%M:%S +0000", tm); + + /* this command asks for logs using two different date + * arguments, separated by ';' (see man rlog). The first +-- +1.6.0.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 14 01:49:23 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 14 Mar 2009 00:49:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[3756] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 3756 http://gar.svn.sourceforge.net/gar/?rev=3756&view=rev Author: bdwalton Date: 2009-03-14 00:49:23 +0000 (Sat, 14 Mar 2009) Log Message: ----------- Fix the makepatch target so it works in GAR v2 again. Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-03-13 20:02:25 UTC (rev 3755) +++ csw/mgar/gar/v2/gar.lib.mk 2009-03-14 00:49:23 UTC (rev 3756) @@ -426,11 +426,11 @@ @echo " ==> Creating patch $@" @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch - @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC).orig - @( cd $(WORKDIR); \ + @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig + @( cd $(WORKDIR_FIRSTMOD); \ if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ cd $(CURDIR); \ - mv -f $(WORKDIR)/gar-base.diff $@; \ + mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ fi ) ### PATCH FILE TYPE MAPPINGS ### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Mar 14 03:13:40 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Mar 2009 02:13:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[3757] csw/mgar/pkg/hatari/trunk Message-ID: Revision: 3757 http://gar.svn.sourceforge.net/gar/?rev=3757&view=rev Author: jake_goerzen Date: 2009-03-14 02:13:39 +0000 (Sat, 14 Mar 2009) Log Message: ----------- add patch file and updates to Makefile Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile csw/mgar/pkg/hatari/trunk/checksums Added Paths: ----------- csw/mgar/pkg/hatari/trunk/files/stdint.h.diff Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2009-03-14 00:49:23 UTC (rev 3756) +++ csw/mgar/pkg/hatari/trunk/Makefile 2009-03-14 02:13:39 UTC (rev 3757) @@ -11,19 +11,19 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWhatari, depend ) -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# NOTE: before building replace stdint.h -> sys/types.h in file src/int.c & src/uae-cpu/sysdeps.h At final link stage linker cannot find -lpng -lreadline force it with LD_OPTIONS=-L/opt/csw/lib gmake build need to make patch. +# NOTE: before building replace stdint.h -> sys/types.h in file src/int.c & src/uae-cpu/sysdeps.h need to make patch. LICENSE = gpl.txt - +PATCHFILES = stdint.h.diff GARCOMPILER = GNU TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket' +BUILD_ARGS = LD_OPTIONS=-L/opt/csw/lib include gar/category.mk Modified: csw/mgar/pkg/hatari/trunk/checksums =================================================================== --- csw/mgar/pkg/hatari/trunk/checksums 2009-03-14 00:49:23 UTC (rev 3756) +++ csw/mgar/pkg/hatari/trunk/checksums 2009-03-14 02:13:39 UTC (rev 3757) @@ -1,3 +1,4 @@ 4aecd42784fae8c5e8c9a9a341146fbb download/hatari-1.2.0.tar.bz2 1f74fc77f3c0664cdd49e2c9cba3fe2d download/CSWhatari.gspec c9dda36e1f7a79cf0c8b65d3503fdc5d download/CSWhatari.depend +26ec668f0b919c0d3c5dc264df17a83f download/stdint.h.diff Added: csw/mgar/pkg/hatari/trunk/files/stdint.h.diff =================================================================== --- csw/mgar/pkg/hatari/trunk/files/stdint.h.diff (rev 0) +++ csw/mgar/pkg/hatari/trunk/files/stdint.h.diff 2009-03-14 02:13:39 UTC (rev 3757) @@ -0,0 +1,31 @@ +diff --speed-large-files --minimal -Nru hatari-1.2.0.orig/src/int.c hatari-1.2.0/src/int.c +--- hatari-1.2.0.orig/src/int.c 2009-01-24 15:12:44.000000000 +0100 ++++ hatari-1.2.0/src/int.c 2009-03-14 02:54:10.150429990 +0100 +@@ -66,7 +66,12 @@ + + const char Int_fileid[] = "Hatari int.c : " __DATE__ " " __TIME__; + ++#if defined (__SVR4) && defined (__sun) ++#include ++#else + #include ++#endif ++ + #include "main.h" + #include "blitter.h" + #include "dmaSnd.h" +diff --speed-large-files --minimal -Nru hatari-1.2.0.orig/src/uae-cpu/sysdeps.h hatari-1.2.0/src/uae-cpu/sysdeps.h +--- hatari-1.2.0.orig/src/uae-cpu/sysdeps.h 2009-01-24 15:12:45.000000000 +0100 ++++ hatari-1.2.0/src/uae-cpu/sysdeps.h 2009-03-14 02:54:19.410281923 +0100 +@@ -30,7 +30,11 @@ + #endif + + #include ++#if defined (__SVR4) && defined (__sun) ++#include ++#else + #include ++#endif + + + #if EEXIST == ENOTEMPTY This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Mar 14 03:17:03 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 14 Mar 2009 02:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3758] csw/mgar/pkg/hatari/trunk/Makefile Message-ID: Revision: 3758 http://gar.svn.sourceforge.net/gar/?rev=3758&view=rev Author: jake_goerzen Date: 2009-03-14 02:17:02 +0000 (Sat, 14 Mar 2009) Log Message: ----------- remove NOTE from Makefile Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2009-03-14 02:13:39 UTC (rev 3757) +++ csw/mgar/pkg/hatari/trunk/Makefile 2009-03-14 02:17:02 UTC (rev 3758) @@ -17,8 +17,6 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# NOTE: before building replace stdint.h -> sys/types.h in file src/int.c & src/uae-cpu/sysdeps.h need to make patch. - LICENSE = gpl.txt PATCHFILES = stdint.h.diff GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat Mar 14 04:13:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 14 Mar 2009 03:13:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3759] csw/mgar/pkg/php5/trunk Message-ID: Revision: 3759 http://gar.svn.sourceforge.net/gar/?rev=3759&view=rev Author: valholla Date: 2009-03-14 03:13:21 +0000 (Sat, 14 Mar 2009) Log Message: ----------- update to build php-5.2.9 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-03-14 02:17:02 UTC (rev 3758) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-03-14 03:13:21 UTC (rev 3759) @@ -1,5 +1,5 @@ GARNAME = php -GARVERSION = 5.2.6 +GARVERSION = 5.2.9 CATEGORIES = lang DESCRIPTION = A high-level scripting language. Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-03-14 02:17:02 UTC (rev 3758) +++ csw/mgar/pkg/php5/trunk/checksums 2009-03-14 03:13:21 UTC (rev 3759) @@ -1,4 +1,4 @@ -7380ffecebd95c6edb317ef861229ebd download/php-5.2.6.tar.bz2 +280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2 e79baa34abe18575a3d0220c21bd5e37 download/php.ini.CSW 90ae3cef3692d7e566c47d89fe39c43d download/phpext 2386fa2c49eb730b6344f49bb5ee0fb1 download/pear.conf.CSW @@ -6,7 +6,7 @@ 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh 8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall 41ec540885de7c34625768aa1fb9682b download/fixme.sh -2b657c95c6abef5f125f19265060f91d download/configure.diff +ab08e2ba62667bf13fa236099e433e84 download/configure.diff 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff 230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff 13db46097c9686302bebf160e2d26ed2 download/pgsql.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat Mar 14 04:13:45 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 14 Mar 2009 03:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3760] csw/mgar/pkg/php5/trunk/files Message-ID: Revision: 3760 http://gar.svn.sourceforge.net/gar/?rev=3760&view=rev Author: valholla Date: 2009-03-14 03:13:45 +0000 (Sat, 14 Mar 2009) Log Message: ----------- update to build php-5.2.9 Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/configure.diff csw/mgar/pkg/php5/trunk/files/fixme.sh csw/mgar/pkg/php5/trunk/files/pear.conf.CSW Added: csw/mgar/pkg/php5/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/php5/trunk/files/configure.diff 2009-03-14 03:13:45 UTC (rev 3760) @@ -0,0 +1,132 @@ +--- php-5.2.9/configure~ 2009-02-25 09:39:40.000000000 -0600 ++++ php-5.2.9/configure 2009-03-13 20:43:49.996093631 -0500 +@@ -4744,7 +4744,7 @@ + $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 + + if test "$?" != "0"; then +- APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option ++ APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then +@@ -4757,7 +4757,7 @@ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php5 $SAPI_SHARED" ++ -i -n php5 $SAPI_SHARED" + fi + fi + +@@ -5905,7 +5905,7 @@ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php5" ++ -i -n php5" + fi + + case $host_alias in +@@ -6753,7 +6753,7 @@ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php5" ++ -i -n php5" + fi + + case $host_alias in +@@ -7770,7 +7770,7 @@ + $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 + + if test "$?" != "0"; then +- APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option ++ APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then +@@ -7783,7 +7783,7 @@ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php5 $SAPI_SHARED" ++ -i -n php5 $SAPI_SHARED" + fi + fi + +@@ -19951,7 +19951,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + +- for i in $PHP_LIBXML_DIR /usr/local /usr; do ++ for i in $PHP_LIBXML_DIR /opt/csw /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" + break +@@ -46061,7 +46061,7 @@ + + if test "$found_iconv" = "no"; then + +- for i in $PHP_ICONV /usr/local /usr; do ++ for i in $PHP_ICONV /opt/csw /usr/local /usr; do + if test -r $i/include/giconv.h; then + cat >> confdefs.h <<\EOF + #define HAVE_GICONV_H 1 +@@ -46542,7 +46542,7 @@ + + if test "$iconv_avail" != "no"; then + if test -z "$ICONV_DIR"; then +- for i in /usr/local /usr; do ++ for i in /opt/csw /usr/local /usr; do + if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then + PHP_ICONV_PREFIX="$i" + break +@@ -68556,7 +68556,7 @@ + echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 + echo "configure:68558: checking for unixODBC support" >&5 + if test "$PHP_UNIXODBC" = "yes"; then +- PHP_UNIXODBC=/usr/local ++ PHP_UNIXODBC=/opt/csw + fi + ODBC_INCDIR=$PHP_UNIXODBC/include + ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR +@@ -77195,8 +77195,8 @@ + echo $ac_n "checking for pg_config""... $ac_c" 1>&6 + echo "configure:77197: checking for pg_config" >&5 + for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do +- if test -x $i/pg_config; then +- PG_CONFIG="$i/pg_config" ++ if test -x $i/pg_config32; then ++ PG_CONFIG="$i/pg_config32" + break; + fi + done +@@ -80000,8 +80000,8 @@ + echo $ac_n "checking for pg_config""... $ac_c" 1>&6 + echo "configure:80002: checking for pg_config" >&5 + for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do +- if test -x $i/pg_config; then +- PG_CONFIG="$i/pg_config" ++ if test -x $i/pg_config32; then ++ PG_CONFIG="$i/pg_config32" + break; + fi + done +@@ -83215,7 +83215,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lreadline $LIBS" ++LIBS="-lreadline -lcurses $LIBS" + cat > conftest.$ac_ext <&6 + echo "configure:103443: checking for XMLRPC-EPI in default path" >&5 +- for i in /usr/local /usr; do ++ for i in /opt/csw /usr/local /usr; do + if test -r $i/include/xmlrpc.h; then + XMLRPC_DIR=$i/include + echo "$ac_t""found in $i" 1>&6 Added: csw/mgar/pkg/php5/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/php5/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/php5/trunk/files/fixme.sh 2009-03-14 03:13:45 UTC (rev 3760) @@ -0,0 +1,49 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} +done + +LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +if [ -f ${LTMAIN} ]; then + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} +fi + Property changes on: csw/mgar/pkg/php5/trunk/files/fixme.sh ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW =================================================================== --- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW (rev 0) +++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-03-14 03:13:45 UTC (rev 3760) @@ -0,0 +1,2 @@ +#PEAR_Config 0.9 +a:29:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/opt/csw/php5/lib/php";s:7:"ext_dir";s:58:"/opt/csw/php5/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/php5/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/php5/bin";s:8:"data_dir";s:26:"/opt/csw/php5/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/php5/lib/php/cfg";s:7:"www_dir";s:25:"/opt/csw/php5/lib/php/www";s:8:"test_dir";s:26:"/opt/csw/php5/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/opt/csw/php5/bin/php";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:16:"/opt/cs w/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:26:"/opt/csw/php5/etc/pearkeys";} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Mar 14 14:49:45 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 14 Mar 2009 13:49:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3761] csw/mgar/pkg/libcairo/trunk Message-ID: Revision: 3761 http://gar.svn.sourceforge.net/gar/?rev=3761&view=rev Author: wbonnet Date: 2009-03-14 13:49:45 +0000 (Sat, 14 Mar 2009) Log Message: ----------- Update to 1.8.6 Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile csw/mgar/pkg/libcairo/trunk/checksums Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2009-03-14 03:13:45 UTC (rev 3760) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2009-03-14 13:49:45 UTC (rev 3761) @@ -1,5 +1,5 @@ GARNAME = libcairo -GARVERSION = 1.8.2 +GARVERSION = 1.8.6 CATEGORIES = lib DESCRIPTION = The Cairo 2D Graphics Library Modified: csw/mgar/pkg/libcairo/trunk/checksums =================================================================== --- csw/mgar/pkg/libcairo/trunk/checksums 2009-03-14 03:13:45 UTC (rev 3760) +++ csw/mgar/pkg/libcairo/trunk/checksums 2009-03-14 13:49:45 UTC (rev 3761) @@ -1,4 +1,4 @@ -44d406e199c338cb60f7db32ffb32bdb download/cairo-1.8.2.tar.gz +4e64139ef6f668df24450f3b81dd0771 download/cairo-1.8.6.tar.gz 14919d48d4e00ee4e18fededcb1454ba download/CSWlibcairo.gspec 858cebcbabf59da9aaa959d915c6d1a9 download/CSWlibcairodevel.gspec 081ffcd10145f9041df467a11342cc98 download/CSWlibcairodoc.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Mar 14 15:21:38 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 14 Mar 2009 14:21:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3762] csw/mgar/pkg/pixman/trunk Message-ID: Revision: 3762 http://gar.svn.sourceforge.net/gar/?rev=3762&view=rev Author: wbonnet Date: 2009-03-14 14:21:38 +0000 (Sat, 14 Mar 2009) Log Message: ----------- Update to 0.14 Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/Makefile csw/mgar/pkg/pixman/trunk/checksums csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2009-03-14 13:49:45 UTC (rev 3761) +++ csw/mgar/pkg/pixman/trunk/Makefile 2009-03-14 14:21:38 UTC (rev 3762) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.12.0 +GARVERSION = 0.14.0 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo @@ -19,10 +19,9 @@ DISTFILES += $(call admfiles,CSWpixman, ) DISTFILES += $(call admfiles,CSWpixmandevel, ) +LICENSE = COPYING + PKGFILES_CSWpixmandevel = $(PKGFILES_DEVEL) -PKGFILES_CSWpixmandevel += $(prefix)/include/.* -PKGFILES_CSWpixmandevel += $(prefix)/lib/.*\.a -PKGFILES_CSWpixmandevel += $(prefix)/lib/pkgconfig/.* REQUIRED_PKGS_CSWpixmandevel = CSWpixman #REQUIRED_PKGS_CSWpixman = CSWlibx11 @@ -31,7 +30,8 @@ CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man --enable-gtk +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --mandir=/opt/csw/share/man --enable-gtk include gar/category.mk Modified: csw/mgar/pkg/pixman/trunk/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2009-03-14 13:49:45 UTC (rev 3761) +++ csw/mgar/pkg/pixman/trunk/checksums 2009-03-14 14:21:38 UTC (rev 3762) @@ -1,3 +1,3 @@ -09357cc74975b01714e00c5899ea1881 download/pixman-0.12.0.tar.gz -5b2d839113c3dbe7bea7da0f54a4d3dc download/CSWpixman.gspec -e2bea793bd3dc27a28c1a83e36f8e94c download/CSWpixmandevel.gspec +da330524bbd975271974378b1c5e7b5d download/pixman-0.14.0.tar.gz +09e58b9e029eb63c896ad2ff70fc7915 download/CSWpixman.gspec +770ffe9900749190af335cbe2e897232 download/CSWpixmandevel.gspec Modified: csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec =================================================================== --- csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec 2009-03-14 13:49:45 UTC (rev 3761) +++ csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec 2009-03-14 14:21:38 UTC (rev 3762) @@ -1,4 +1,6 @@ %var bitname pixman %var pkgname CSWpixman %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/%{GARNAME} for license information Modified: csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec =================================================================== --- csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec 2009-03-14 13:49:45 UTC (rev 3761) +++ csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec 2009-03-14 14:21:38 UTC (rev 3762) @@ -1,4 +1,6 @@ %var bitname pixman_devel %var pkgname CSWpixmandevel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING +%copyright + +Please see /opt/csw/share/doc/%{GARNAME} for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Mar 14 17:25:09 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 14 Mar 2009 16:25:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3763] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 3763 http://gar.svn.sourceforge.net/gar/?rev=3763&view=rev Author: j_arndt Date: 2009-03-14 16:25:09 +0000 (Sat, 14 Mar 2009) Log Message: ----------- nsca: consolidated paths / ownerships / permissions, SMF now with cswclassutils Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff Added Paths: ----------- csw/mgar/pkg/nsca/trunk/files/cswnsca Removed Paths: ------------- csw/mgar/pkg/nsca/trunk/files/CSWnsca.depend csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.depend csw/mgar/pkg/nsca/trunk/files/makefile.diff csw/mgar/pkg/nsca/trunk/files/nsca csw/mgar/pkg/nsca/trunk/files/nsca.xml csw/mgar/pkg/nsca/trunk/files/svc-nsca Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-14 16:25:09 UTC (rev 3763) @@ -10,14 +10,16 @@ MASTER_SITES = http://mesh.dl.sourceforge.net/sourceforge/nagios/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWnsca, prototype checkinstall preinstall ) -DISTFILES += $(call admfiles,CSWsendnsca, preinstall ) -DISTFILES += nsca nsca.xml svc-nsca +DISTFILES += $(call admfiles,CSWsendnsca, prototype preinstall ) +DISTFILES += cswnsca PATCHFILES += submit_check_results.diff -REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWnagios -REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt CSWnagios +REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils +REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt +SPKG_CLASSES = none cswinitsmf + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 @@ -31,10 +33,8 @@ NAGIOSCFGDIR=$(prefix)/nagios/etc NSCADOCDIR=$(prefix)/share/doc/nsca SENDNSCADOCDIR=$(prefix)/share/doc/send_nsca -CFGDIR=$(prefix)/etc post-install-modulated: - ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(prefix)/nagios/bin ginstall -d $(DESTDIR)$(prefix)/nagios/etc ginstall -m 755 -d $(DESTDIR)$(NSCADOCDIR) @@ -44,13 +44,14 @@ ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(NSCADOCDIR) - ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR) + ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(NAGIOSBINDIR) ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) - ginstall -m 755 -d $(DESTDIR)$(CFGDIR) ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) - ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg + ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/send_nsca.cfg ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(SENDNSCADOCDIR) + ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ + ginstall -m 755 $(FILEDIR)/cswnsca $(DESTDIR)/etc/opt/csw/init.d/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/checksums 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,11 +1,10 @@ 33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz -f23029e0be9b0379f46a52101c28f328 download/CSWnsca.gspec -9fa3302e1adfe6fb72e91b3cb0f5fdc3 download/CSWnsca.prototype +82f1144c12dc6247524609dbeefc3023 download/CSWnsca.gspec +22cc4e3984d0627708f954c39fa6a22a download/CSWnsca.prototype 1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall 7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall b82767ed7ab002fea4b3a4395511c93c download/CSWsendnsca.gspec +49309205ad3d77c99f9bd469cc3860d2 download/CSWsendnsca.prototype 8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall -58baa05824b28682cef9e678c3d0cefa download/nsca -b36f9006d3f725cc8d6cb9c01533a75c download/nsca.xml -58baa05824b28682cef9e678c3d0cefa download/svc-nsca -cbb38cacd3ca318f00dfa0877b6017df download/submit_check_results.diff +e2ea854aa2df24d432ba37ae614f9fa4 download/cswnsca +08b769c5511342dd03fa01fea44cb260 download/submit_check_results.diff Deleted: csw/mgar/pkg/nsca/trunk/files/CSWnsca.depend =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.depend 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.depend 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,3 +0,0 @@ -P CSWlibmcrypt libmcrypt - GPL replacement for Unix crypt that supports a wide range of algorithms and modes -P CSWlibtoolrt libtool_rt - Generic library support runtime libraries -P CSWnagios nagios nagios network monitoring base package (no plugins) Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,8 +1,3 @@ %var bitname nsca %var pkgname CSWnsca -%var SERVICE_CONF_FILES /opt/csw/nagios/etc/nsca.cfg -%var RC_INIT_SCRIPT nsca -%var SMF_SCRIPT svc-nsca -%var SMF_MANIFEST nsca.xml %include url file://%{PKGLIB}/csw_dyndepend.gspec -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,13 +1,13 @@ -1 d none /opt/csw/nagios/bin 0755 root bin -1 f none /opt/csw/nagios/bin/nsca 0755 root bin -1 d none /opt/csw/nagios/etc 0755 root bin -1 f none /opt/csw/nagios/etc/nsca.cfg 0600 root bin +1 d none /opt/csw/nagios/bin 0755 nagios nagios +1 f none /opt/csw/nagios/bin/nsca 0755 nagios nagios +1 d none /opt/csw/nagios/etc 0755 nagios +1 f none /opt/csw/nagios/etc/nsca.cfg 0600 nagios nagios 1 d none /opt/csw/share/doc/nsca 0755 root bin 1 f none /opt/csw/share/doc/nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/nsca/LEGAL 0644 root bin 1 f none /opt/csw/share/doc/nsca/README 0644 root bin 1 f none /opt/csw/share/doc/nsca/SECURITY 0644 root bin +f cswinitsmf /etc/opt/csw/init.d/cswnsca 0755 root bin 1 i checkinstall=CSWnsca.checkinstall -1 i depend=CSWnsca.depend 1 i pkginfo=CSWnsca.pkginfo 1 i preinstall=CSWnsca.preinstall Deleted: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.depend =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.depend 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.depend 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,3 +0,0 @@ -P CSWlibmcrypt libmcrypt - GPL replacement for Unix crypt that supports a wide range of algorithms and modes -P CSWlibtoolrt libtool_rt - Generic library support runtime libraries -P CSWnagios nagios nagios network monitoring base package (no plugins) Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,13 +1,12 @@ -1 d none /opt/csw/bin 0755 root bin -1 f none /opt/csw/bin/send_nsca 0755 root bin -1 d none /opt/csw/etc 0755 root bin -1 f none /opt/csw/etc/send_nsca.cfg 0644 root bin +1 d none /opt/csw/nagios/bin 0755 nagios nagios +1 f none /opt/csw/nagios/bin/send_nsca 0755 nagios nagios +1 d none /opt/csw/nagios/etc 0755 nagios nagios +1 f none /opt/csw/nagios/etc/send_nsca.cfg 0644 nagios nagios 1 d none /opt/csw/share/doc/send_nsca 0755 root bin 1 f none /opt/csw/share/doc/send_nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/send_nsca/LEGAL 0644 root bin 1 f none /opt/csw/share/doc/send_nsca/README 0644 root bin 1 f none /opt/csw/share/doc/send_nsca/SECURITY 0644 root bin 1 f none /opt/csw/share/doc/send_nsca/submit_check_result-sample 0755 root bin -1 i depend 102 8932 1233484206 -1 i pkginfo 318 26530 1233484206 -1 i preinstall 1105 19093 1230467644 +1 i pkginfo=CSWsendnsca.pkginfo +1 i preinstall=CSWsendnsca.preinstall Added: csw/mgar/pkg/nsca/trunk/files/cswnsca =================================================================== --- csw/mgar/pkg/nsca/trunk/files/cswnsca (rev 0) +++ csw/mgar/pkg/nsca/trunk/files/cswnsca 2009-03-14 16:25:09 UTC (rev 3763) @@ -0,0 +1,49 @@ +#!/bin/sh +# +# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. +# All rights reserved. +# +#ident "@(#)nsca 1.19 01/12/05 SMI" +# Modified for OpenCSW by Juergen Arndt 2009-02-08 +# (derived from svc-nrpe written by Alex Moore) + +#FMRI application # FMRI path for service + +CONFIG_FILE=/opt/csw/nagios/etc/nsca.cfg +BIN_FILE="/opt/csw/nagios/bin/nsca" +pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` +nsca_USER=`awk -F'=' '/nsca_user/ { print $NF }' $CONFIG_FILE` + +case "$1" in +'restart') + [ -n "`pgrep -x -u 0,1,$nsca_USER nsca`" ] && /usr/bin/kill `head -1 $pidfile` + # remove pid file + if [ -f "$pidfile" ]; then + rm "$pidfile" + fi + if [ -f $CONFIG_FILE ]; then + wait 1 + $BIN_FILE -c $CONFIG_FILE -d + fi + ;; + +'start') + if [ -f $CONFIG_FILE ]; then + $BIN_FILE -c $CONFIG_FILE -d + fi + ;; + +'stop') + [ -n "`pgrep -x -u 0,1,$nsca_USER nsca`" ] && /usr/bin/kill `head -1 $pidfile` + # remove pid file + if [ -f "$pidfile" ]; then + rm "$pidfile" + fi + ;; + +*) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac +exit 0 Deleted: csw/mgar/pkg/nsca/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/nsca/trunk/files/makefile.diff 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/makefile.diff 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,46 +0,0 @@ -diff --speed-large-files --minimal -Nru nsca-2.7.2.orig/Makefile.in nsca-2.7.2/Makefile.in ---- nsca-2.7.2.orig/Makefile.in 2003-10-16 01:17:45.000000000 +0200 -+++ nsca-2.7.2/Makefile.in 2009-02-11 10:25:05.717351194 +0100 -@@ -9,6 +9,15 @@ - SRC_BASE=./src/ - SRC_INCLUDE=./include/ - -+prefix=@prefix@ -+BINDIR=@bindir@ -+NAGIOSBINDIR=@prefix@/nagios/bin -+NAGIOSCFGDIR=@prefix@/nagios/etc -+CFGDIR=@sysconfdir@ -+NSCADOCDIR=$(prefix)/share/doc/nsca -+SENDNSCADOCDIR=@prefix@/share/doc/send_nsca -+INSTALL=@INSTALL@ -+ - all: - cd $(SRC_BASE); $(MAKE) $@ ; cd .. - -@@ -35,6 +44,26 @@ - @echo "client and server binaries." - @echo "" - -+install-nsca: -+ $(INSTALL) -m 755 src/nsca $(DESTDIR)$(NAGIOSBINDIR) -+ $(INSTALL) -m 600 sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg -+ $(INSTALL) -m 755 -d $(DESTDIR)$(NSCADOCDIR) -+ $(INSTALL) -m 644 ./Changelog $(DESTDIR)$(NSCADOCDIR) -+ $(INSTALL) -m 644 ./LEGAL $(DESTDIR)$(NSCADOCDIR) -+ $(INSTALL) -m 644 ./README $(DESTDIR)$(NSCADOCDIR) -+ $(INSTALL) -m 644 ./SECURITY $(DESTDIR)$(NSCADOCDIR) -+ -+install-sendnsca: -+ $(INSTALL) -m 755 src/send_nsca $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(CFGDIR) -+ $(INSTALL) -m 755 src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) -+ $(INSTALL) -m 600 sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg -+ $(INSTALL) -m 644 ./Changelog $(DESTDIR)$(SENDNSCADOCDIR) -+ $(INSTALL) -m 644 ./LEGAL $(DESTDIR)$(SENDNSCADOCDIR) -+ $(INSTALL) -m 644 ./README $(DESTDIR)$(SENDNSCADOCDIR) -+ $(INSTALL) -m 644 ./SECURITY $(DESTDIR)$(SENDNSCADOCDIR) -+ - clean: - cd $(SRC_BASE); $(MAKE) $@ ; cd .. - rm -f core Deleted: csw/mgar/pkg/nsca/trunk/files/nsca =================================================================== --- csw/mgar/pkg/nsca/trunk/files/nsca 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/nsca 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "@(#)nsca 1.19 01/12/05 SMI" -# Modified for OpenCSW by Juergen Arndt 2009-02-08 -# (derived from svc-nrpe written by Alex Moore) - -CONFIG_FILE=/opt/csw/nagios/etc/nsca.cfg -BIN_FILE="/opt/csw/nagios/bin/nsca" -pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` -nsca_USER=`awk -F'=' '/nsca_user/ { print $NF }' $CONFIG_FILE` - -case "$1" in -'restart') - [ -n "`pgrep -x -u 0,1,$nsca_USER nsca`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - if [ -f $CONFIG_FILE ]; then - wait 1 - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'start') - if [ -f $CONFIG_FILE ]; then - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'stop') - [ -n "`pgrep -x -u 0,1,$nsca_USER nsca`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - ;; - -*) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; -esac -exit 0 Deleted: csw/mgar/pkg/nsca/trunk/files/nsca.xml =================================================================== --- csw/mgar/pkg/nsca/trunk/files/nsca.xml 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/nsca.xml 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff =================================================================== --- csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff 2009-03-14 16:25:09 UTC (rev 3763) @@ -37,4 +37,4 @@ +# in turn transmits the data to the nsca daemon on the central +# monitoring server + -+/usr/bin/echo "$1\t$2\t$return_code\t$4" | /opt/csw/bin/send_nsca my.central.server -c /opt/csw/etc/send_nsca.cfg ++/usr/bin/echo "$1\t$2\t$return_code\t$4" | /opt/csw/nagios/bin/send_nsca my.central.server -c /opt/csw/nagios/etc/send_nsca.cfg Deleted: csw/mgar/pkg/nsca/trunk/files/svc-nsca =================================================================== --- csw/mgar/pkg/nsca/trunk/files/svc-nsca 2009-03-14 14:21:38 UTC (rev 3762) +++ csw/mgar/pkg/nsca/trunk/files/svc-nsca 2009-03-14 16:25:09 UTC (rev 3763) @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "@(#)nsca 1.19 01/12/05 SMI" -# Modified for OpenCSW by Juergen Arndt 2009-02-08 -# (derived from svc-nrpe written by Alex Moore) - -CONFIG_FILE=/opt/csw/nagios/etc/nsca.cfg -BIN_FILE="/opt/csw/nagios/bin/nsca" -pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` -nsca_USER=`awk -F'=' '/nsca_user/ { print $NF }' $CONFIG_FILE` - -case "$1" in -'restart') - [ -n "`pgrep -x -u 0,1,$nsca_USER nsca`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - if [ -f $CONFIG_FILE ]; then - wait 1 - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'start') - if [ -f $CONFIG_FILE ]; then - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'stop') - [ -n "`pgrep -x -u 0,1,$nsca_USER nsca`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - ;; - -*) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; -esac -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Mar 14 18:02:52 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 14 Mar 2009 17:02:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3764] csw/mgar/pkg/nsca/trunk/Makefile Message-ID: Revision: 3764 http://gar.svn.sourceforge.net/gar/?rev=3764&view=rev Author: j_arndt Date: 2009-03-14 17:02:52 +0000 (Sat, 14 Mar 2009) Log Message: ----------- nsca: added configure option Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-14 16:25:09 UTC (rev 3763) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-14 17:02:52 UTC (rev 3764) @@ -22,6 +22,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 +CONFIGURE_ARGS += --localstatedir=/opt/csw/nagios/var BUILD_TARGETS = nsca This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Mar 14 19:15:36 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 14 Mar 2009 18:15:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[3765] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 3765 http://gar.svn.sourceforge.net/gar/?rev=3765&view=rev Author: j_arndt Date: 2009-03-14 18:15:35 +0000 (Sat, 14 Mar 2009) Log Message: ----------- nrpe: consolidated paths / permissions / ownerships, SMF via cswclassutils Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/cswnrpe Removed Paths: ------------- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.depend csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.depend csw/mgar/pkg/nrpe/trunk/files/doc.diff csw/mgar/pkg/nrpe/trunk/files/makefile.diff csw/mgar/pkg/nrpe/trunk/files/nrpe csw/mgar/pkg/nrpe/trunk/files/nrpe.xml csw/mgar/pkg/nrpe/trunk/files/svc-nrpe Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-14 18:15:35 UTC (rev 3765) @@ -2,7 +2,7 @@ GARVERSION = 2.12 CATEGORIES = apps -DESCRIPTION = NRPE daemon for Nagios +DESCRIPTION = NRPE for Nagios define BLURB NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. endef @@ -10,13 +10,15 @@ SF_PROJ = nagios MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall postinstall preremove ) -DISTFILES += svc-nrpe nrpe.xml nrpe +DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall preremove ) +DISTFILES += cswnrpe DISTFILES += $(call admfiles,CSWnrpeplugin, prototype ) -REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap -REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt +REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils +REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt +SPKG_CLASSES = none cswinitsmf + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include @@ -30,7 +32,7 @@ PATCHFILES += configure.diff sysconfdir = $(prefix)/nagios/etc -bindir = $(prefix)/bin +bindir = $(prefix)/nagios/bin libexecdir = $(prefix)/libexec/nagios-plugins datadir = $(prefix)/share @@ -57,4 +59,6 @@ ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR) ginstall -m 775 -d $(DESTDIR)$(CFGDIR) ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR) + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe @$(MAKECOOKIE) Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,13 +1,10 @@ b2d75e2962f1e3151ef58794d60c9e97 download/nrpe-2.12.tar.gz -cc0aa5807e491e4ae15124da5aca4be1 download/CSWnrpe.gspec -244f45e40f17aa98a0bb1a93ed7b9554 download/CSWnrpe.prototype +92411c5c2fd596a0e1b5fd77f97bff4b download/CSWnrpe.gspec +4dd4b521ecafb3742bdbbdd7d6e84403 download/CSWnrpe.prototype bda68135e2b65da40c3d2b68a3b8dc78 download/CSWnrpe.checkinstall 53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall -71c9056ac6d0010a748745a405385d55 download/CSWnrpe.postinstall 393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove -ec1857a4400022e3eec874c34e2b7232 download/svc-nrpe -1ee84a3e24cd4237bbb1fae59fc1d4ca download/nrpe.xml -ec1857a4400022e3eec874c34e2b7232 download/nrpe +708c90700a7e1d79fe06e94a78fc1eea download/cswnrpe 54aebe8f3d7bc8d2ec5ea1954d859b10 download/CSWnrpeplugin.gspec e22a7817c7665e79bcbad7e091375be9 download/CSWnrpeplugin.prototype 5b02d4385daaea2a8c13903539aa6189 download/patch.diff Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.depend =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.depend 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.depend 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,2 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWtcpwrap tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec 2009-03-14 18:15:35 UTC (rev 3765) @@ -2,8 +2,3 @@ %var pkgname CSWnrpe %include url file://%{PKGLIB}/csw_dyndepend.gspec #%copyright url file://%{WORKSRC}/LICENSE -%var SERVICE_CONF_FILES /opt/csw/nagios/etc/nrpe.cfg -%var RC_INIT_SCRIPT nrpe -%var SMF_SCRIPT svc-nrpe -%var SMF_MANIFEST nrpe.xml -%include url file://%{PKGLIB}/smf_enabled.gspec Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,11 +1,13 @@ -d none /opt/csw/bin 0755 nagios nagios -f none /opt/csw/bin/nrpe 0775 nagios nagios -1 f none /opt/csw/nagios/etc/nrpe.cfg 0644 root bin +d none /opt/csw/nagios/bin 0755 nagios nagios +f none /opt/csw/nagios/bin/nrpe 0775 nagios nagios +d none /opt/csw/nagios/etc 0755 nagios nagios +f none /opt/csw/nagios/etc/nrpe.cfg 0644 nagios nagios d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin f none /opt/csw/share/doc/nrpe/README 0644 root bin f none /opt/csw/share/doc/nrpe/README.SSL 0644 root bin f none /opt/csw/share/doc/nrpe/SECURITY 0644 root bin +f cswinitsmf /etc/opt/csw/init.d/cswnrpe 0755 root bin i depend=CSWnrpe.depend i pkginfo=CSWnrpe.pkginfo Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.depend =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.depend 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.depend 2009-03-14 18:15:35 UTC (rev 3765) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Added: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-03-14 18:15:35 UTC (rev 3765) @@ -0,0 +1,54 @@ +#!/bin/sh +# +# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. +# All rights reserved. +# +#ident "@(#)nrpe 1.19 01/12/05 SMI" +# Modified for CSW by Alex Moore 2005-12-03 +# 2007-08-18 Add pid file support. +# 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. +# Modified for OpenCSW by Juergen Arndt 2009-03-14 + +#FMRI application # FMRI path for service + +CONFIG_FILE=/etc/opt/csw/nrpe.cfg +if [ ! -f $CONFIG_FILE ] ; then + CONFIG_FILE=/opt/csw/nagios/etc/nrpe.cfg +fi +BIN_FILE="/opt/csw/nagios/bin/nrpe" +pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` +NRPE_USER=`awk -F'=' '/nrpe_user/ { print $NF }' $CONFIG_FILE` + +case "$1" in +'restart') + [ -n "`pgrep -x -u 0,1,$NRPE_USER nrpe`" ] && /usr/bin/kill `head -1 $pidfile` + # remove pid file + if [ -f "$pidfile" ]; then + rm "$pidfile" + fi + if [ -f $CONFIG_FILE ]; then + wait 1 + $BIN_FILE -c $CONFIG_FILE -d + fi + ;; + +'start') + if [ -f $CONFIG_FILE ]; then + $BIN_FILE -c $CONFIG_FILE -d + fi + ;; + +'stop') + [ -n "`pgrep -x -u 0,1,$NRPE_USER nrpe`" ] && /usr/bin/kill `head -1 $pidfile` + # remove pid file + if [ -f "$pidfile" ]; then + rm "$pidfile" + fi + ;; + +*) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac +exit 0 Deleted: csw/mgar/pkg/nrpe/trunk/files/doc.diff =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/doc.diff 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/doc.diff 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,36 +0,0 @@ -diff --speed-large-files --minimal -Nru nrpe-2.12.orig/Makefile.in nrpe-2.12/Makefile.in ---- nrpe-2.12.orig/Makefile.in 2008-12-25 13:05:01.688902701 +0100 -+++ nrpe-2.12/Makefile.in 2008-12-25 13:04:44.279858247 +0100 -@@ -8,6 +8,7 @@ - # Source code directories - SRC_BASE=./src/ - SRC_INCLUDE=./include/ -+DOC_BASE=./docs/ - - CC=@CC@ - CFLAGS=@CFLAGS@ @DEFS@ -@@ -19,6 +20,8 @@ - BINDIR=@bindir@ - SBINDIR=@sbindir@ - LIBEXECDIR=@libexecdir@ -+DATADIR=@datadir@ -+DOCDIR=$(DATADIR)/doc/nrpe - INSTALL=@INSTALL@ - NAGIOS_INSTALL_OPTS= - NRPE_INSTALL_OPTS= -@@ -62,6 +65,15 @@ - $(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) - $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR) - -+install-docs: -+ $(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) $(DOC_BASE)/NRPE.pdf $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) ./LEGAL $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) ./README $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) ./README.SSL $(DESTDIR)$(DOCDIR) -+ $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) ./SECURITY $(DESTDIR)$(DOCDIR) -+ -+ - clean: - cd $(SRC_BASE); $(MAKE) $@ ; cd .. - rm -f core Deleted: csw/mgar/pkg/nrpe/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/makefile.diff 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/makefile.diff 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,28 +0,0 @@ -diff --speed-large-files --minimal -Nru nrpe-2.12.orig/Makefile.in nrpe-2.12/Makefile.in ---- nrpe-2.12.orig/Makefile.in 2007-03-14 16:30:05.000000000 +0100 -+++ nrpe-2.12/Makefile.in 2008-12-23 21:18:00.782772164 +0100 -@@ -20,8 +20,8 @@ - SBINDIR=@sbindir@ - LIBEXECDIR=@libexecdir@ - INSTALL=@INSTALL@ --NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@ --NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@ -+NAGIOS_INSTALL_OPTS= -+NRPE_INSTALL_OPTS= - - INIT_DIR=@init_dir@ - INIT_OPTS=-o root -g root -diff --speed-large-files --minimal -Nru nrpe-2.12.orig/src/Makefile.in nrpe-2.12/src/Makefile.in ---- nrpe-2.12.orig/src/Makefile.in 2007-08-13 19:10:07.000000000 +0200 -+++ nrpe-2.12/src/Makefile.in 2008-12-23 21:21:13.784808266 +0100 -@@ -24,8 +24,8 @@ - SBINDIR=@sbindir@ - LIBEXECDIR=@libexecdir@ - INSTALL=@INSTALL@ --NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@ --NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@ -+NAGIOS_INSTALL_OPTS= -+NRPE_INSTALL_OPTS= - - # Generated automatically from configure script - SNPRINTF_O=@SNPRINTF_O@ Deleted: csw/mgar/pkg/nrpe/trunk/files/nrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/nrpe 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/nrpe 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "@(#)nrpe 1.19 01/12/05 SMI" -# Modified for CSW by Alex Moore 2005-12-03 -# 2007-08-18 Add pid file support. -# 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. - -CONFIG_FILE=/etc/opt/csw/nrpe.cfg -if [ ! -f $CONFIG_FILE ] ; then - CONFIG_FILE=/opt/csw/nagios/etc/nrpe.cfg -fi -BIN_FILE="/opt/csw/bin/nrpe" -pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` -NRPE_USER=`awk -F'=' '/nrpe_user/ { print $NF }' $CONFIG_FILE` - -case "$1" in -'restart') - [ -n "`pgrep -x -u 0,1,$NRPE_USER nrpe`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - if [ -f $CONFIG_FILE ]; then - wait 1 - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'start') - if [ -f $CONFIG_FILE ]; then - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'stop') - [ -n "`pgrep -x -u 0,1,$NRPE_USER nrpe`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - ;; - -*) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; -esac -exit 0 Deleted: csw/mgar/pkg/nrpe/trunk/files/nrpe.xml =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/nrpe.xml 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/nrpe.xml 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/nrpe/trunk/files/svc-nrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/svc-nrpe 2009-03-14 17:02:52 UTC (rev 3764) +++ csw/mgar/pkg/nrpe/trunk/files/svc-nrpe 2009-03-14 18:15:35 UTC (rev 3765) @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "@(#)nrpe 1.19 01/12/05 SMI" -# Modified for CSW by Alex Moore 2005-12-03 -# 2007-08-18 Add pid file support. -# 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. - -CONFIG_FILE=/etc/opt/csw/nrpe.cfg -if [ ! -f $CONFIG_FILE ] ; then - CONFIG_FILE=/opt/csw/nagios/etc/nrpe.cfg -fi -BIN_FILE="/opt/csw/bin/nrpe" -pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` -NRPE_USER=`awk -F'=' '/nrpe_user/ { print $NF }' $CONFIG_FILE` - -case "$1" in -'restart') - [ -n "`pgrep -x -u 0,1,$NRPE_USER nrpe`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - if [ -f $CONFIG_FILE ]; then - wait 1 - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'start') - if [ -f $CONFIG_FILE ]; then - $BIN_FILE -c $CONFIG_FILE -d - fi - ;; - -'stop') - [ -n "`pgrep -x -u 0,1,$NRPE_USER nrpe`" ] && /usr/bin/kill `head -1 $pidfile` - # remove pid file - if [ -f "$pidfile" ]; then - rm "$pidfile" - fi - ;; - -*) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; -esac -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat Mar 14 22:12:36 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 14 Mar 2009 21:12:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[3766] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 3766 http://gar.svn.sourceforge.net/gar/?rev=3766&view=rev Author: j_arndt Date: 2009-03-14 21:12:33 +0000 (Sat, 14 Mar 2009) Log Message: ----------- nagios: fixed two path issues Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-03-14 18:15:35 UTC (rev 3765) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-03-14 21:12:33 UTC (rev 3766) @@ -3,7 +3,7 @@ e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall 47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -92467193beb7d39c7a56a520731cfb5c download/CSWnagios.prototype +b3edb7772696d23bfc3973e04b7d8d5d download/CSWnagios.prototype d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios 0ef601e30d01a511822dd27df6b0e531 download/patch.diff 4faa5ec86586be23dfbbd9165f50046d download/configure.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-14 18:15:35 UTC (rev 3765) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-14 21:12:33 UTC (rev 3766) @@ -1,3 +1,4 @@ +d none /opt/csw/nagios 0755 root bin d none /opt/csw/nagios/bin 0755 nagios nagios f none /opt/csw/nagios/bin/nagios 0774 nagios nagios f none /opt/csw/nagios/bin/nagiostats 0774 nagios nagios @@ -376,6 +377,7 @@ f none /opt/csw/nagios/share/stylesheets/tac.css 0664 nagios nagios f none /opt/csw/nagios/share/stylesheets/trends.css 0664 nagios nagios d none /opt/csw/nagios/var 0755 nagios nagios +d none /opt/csw/nagios/var/spool 0755 nagios nagios d none /opt/csw/nagios/var/archives 0755 nagios nagios d none /opt/csw/nagios/var/rw 2770 nagios nagioscm d none /opt/csw/nagios/var/spool/checkresults 0755 nagios nagios This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 15 06:28:48 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 15 Mar 2009 05:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3767] csw/mgar/pkg Message-ID: Revision: 3767 http://gar.svn.sourceforge.net/gar/?rev=3767&view=rev Author: hson Date: 2009-03-15 05:28:48 +0000 (Sun, 15 Mar 2009) Log Message: ----------- libgsf: Initial commit Added Paths: ----------- csw/mgar/pkg/libgsf/ csw/mgar/pkg/libgsf/branches/ csw/mgar/pkg/libgsf/tags/ csw/mgar/pkg/libgsf/trunk/ csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgsf/trunk/checksums csw/mgar/pkg/libgsf/trunk/files/ Property changes on: csw/mgar/pkg/libgsf/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2009-03-15 05:28:48 UTC (rev 3767) @@ -0,0 +1,36 @@ +GARNAME = libgsf +GARVERSION = 1.14.11 +CATEGORIES = gnome + +DESCRIPTION = GNOME Structured File Library +define BLURB + The GNOME Structured File Library (GSF) is an I/O abstraction for + reading/writing compound files. GSF is released under the GNU Lesser + General Public License (GNU LGPL), which allows for flexible licensing of + client applications. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PREREQUISITE_PKGS += CSWgnulinks CSWgtkdoc + +REQUIRED_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2 +REQUIRED_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + +#NPATH = /opt/csw/gnu:$(PATH) + +CONFIGURE_ARGS = $(DIRPATHS) +#CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) +#CONFIGURE_ARGS += --enable-gtk-doc=no +#CONFIGURE_ARGS += --disable-man-gtk-doc + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgsf/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgsf/trunk/checksums 2009-03-15 05:28:48 UTC (rev 3767) @@ -0,0 +1 @@ +7d6fa1c26ebb58dcf2128c3b9c7d1a2a download/libgsf-1.14.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 15 06:38:30 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 15 Mar 2009 05:38:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[3768] csw/mgar/pkg Message-ID: Revision: 3768 http://gar.svn.sourceforge.net/gar/?rev=3768&view=rev Author: hson Date: 2009-03-15 05:38:30 +0000 (Sun, 15 Mar 2009) Log Message: ----------- libgoffice: Initial commit Added Paths: ----------- csw/mgar/pkg/libgoffice/ csw/mgar/pkg/libgoffice/branches/ csw/mgar/pkg/libgoffice/tags/ csw/mgar/pkg/libgoffice/trunk/ csw/mgar/pkg/libgoffice/trunk/Makefile csw/mgar/pkg/libgoffice/trunk/checksums csw/mgar/pkg/libgoffice/trunk/files/ Property changes on: csw/mgar/pkg/libgoffice/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgoffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgoffice/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgoffice/trunk/Makefile 2009-03-15 05:38:30 UTC (rev 3768) @@ -0,0 +1,27 @@ +GARNAME = libgoffice +GARVERSION = 0.7.3 +CATEGORIES = gnome + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = goffice-$(GARVERSION).tar.gz +DISTNAME = goffice-$(GARVERSION) + +REQUIRED_PKGS += CSWgconf2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk +REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgsf CSWlibxml2 CSWlibxrender +REQUIRED_PKGS += CSWpango CSWsunmath CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = goffice-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = + +include gar/category.mk + +PATH :=/opt/csw/bin:/opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgoffice/trunk/checksums =================================================================== --- csw/mgar/pkg/libgoffice/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgoffice/trunk/checksums 2009-03-15 05:38:30 UTC (rev 3768) @@ -0,0 +1 @@ +515bf59321337fe432c8c9bb4835fc52 download/goffice-0.7.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 15 06:48:50 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 15 Mar 2009 05:48:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[3769] csw/mgar/pkg Message-ID: Revision: 3769 http://gar.svn.sourceforge.net/gar/?rev=3769&view=rev Author: hson Date: 2009-03-15 05:48:49 +0000 (Sun, 15 Mar 2009) Log Message: ----------- gtk-doc: Initial commit Added Paths: ----------- csw/mgar/pkg/gtk-doc/ csw/mgar/pkg/gtk-doc/branches/ csw/mgar/pkg/gtk-doc/tags/ csw/mgar/pkg/gtk-doc/trunk/ csw/mgar/pkg/gtk-doc/trunk/Makefile csw/mgar/pkg/gtk-doc/trunk/checksums csw/mgar/pkg/gtk-doc/trunk/files/ csw/mgar/pkg/gtk-doc/trunk/files/CSWgtkdoc.gspec Property changes on: csw/mgar/pkg/gtk-doc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gtk-doc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-15 05:48:49 UTC (rev 3769) @@ -0,0 +1,26 @@ +GARNAME = gtk-doc +GARVERSION = 1.11 +CATEGORIES = gnome + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWgtkdoc, ) + +PREREQUISITE_PKGS += CSWsgmlcommon CSWxmlcommon CSWdocbookxsl CSWscrollkeeper +PREREQUISITE_PKGS += CSWopenjade + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-xml-catalog=/opt/csw/etc/xml/catalog + +#TEST_TARGET = check +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/gtk-doc/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtk-doc/trunk/checksums 2009-03-15 05:48:49 UTC (rev 3769) @@ -0,0 +1,2 @@ +94e02c937b6970e79657c705159b7d17 download/gtk-doc-1.11.tar.gz +4a160ff0b2cf792141850d576a8f8fa4 download/CSWgtkdoc.gspec Added: csw/mgar/pkg/gtk-doc/trunk/files/CSWgtkdoc.gspec =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/files/CSWgtkdoc.gspec (rev 0) +++ csw/mgar/pkg/gtk-doc/trunk/files/CSWgtkdoc.gspec 2009-03-15 05:48:49 UTC (rev 3769) @@ -0,0 +1,4 @@ +%var bitname gtkdoc +%var pkgname CSWgtkdoc +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 15 07:03:37 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 15 Mar 2009 06:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3770] csw/mgar/pkg/gtk-doc/trunk/Makefile Message-ID: Revision: 3770 http://gar.svn.sourceforge.net/gar/?rev=3770&view=rev Author: hson Date: 2009-03-15 06:03:37 +0000 (Sun, 15 Mar 2009) Log Message: ----------- gtk-doc: Description update Modified Paths: -------------- csw/mgar/pkg/gtk-doc/trunk/Makefile Modified: csw/mgar/pkg/gtk-doc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-15 05:48:49 UTC (rev 3769) +++ csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-15 06:03:37 UTC (rev 3770) @@ -2,9 +2,11 @@ GARVERSION = 1.11 CATEGORIES = gnome -DESCRIPTION = Brief description +DESCRIPTION = GTK-Doc is used to document C code. define BLURB - Long description + GTK-Doc is used to document C code. It is typically used to document the + public API of libraries, such as the GTK+ and GNOME libraries. But it can + also be used to document application code. endef MASTER_SITES = $(GNOME_MIRROR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 15 07:17:09 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 15 Mar 2009 06:17:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3771] csw/mgar/pkg/libgoffice/trunk/Makefile Message-ID: Revision: 3771 http://gar.svn.sourceforge.net/gar/?rev=3771&view=rev Author: hson Date: 2009-03-15 06:17:09 +0000 (Sun, 15 Mar 2009) Log Message: ----------- libgoffice: Description update Modified Paths: -------------- csw/mgar/pkg/libgoffice/trunk/Makefile Modified: csw/mgar/pkg/libgoffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgoffice/trunk/Makefile 2009-03-15 06:03:37 UTC (rev 3770) +++ csw/mgar/pkg/libgoffice/trunk/Makefile 2009-03-15 06:17:09 UTC (rev 3771) @@ -2,9 +2,10 @@ GARVERSION = 0.7.3 CATEGORIES = gnome -DESCRIPTION = Brief description +DESCRIPTION = Document centric objects library define BLURB - Long description + GOffice is a library of document centric objects and utilities building on + top of GLib and Gtk+. endef MASTER_SITES = $(GNOME_MIRROR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Mar 16 00:01:36 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 15 Mar 2009 23:01:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[3772] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 3772 http://gar.svn.sourceforge.net/gar/?rev=3772&view=rev Author: skayser Date: 2009-03-15 23:01:36 +0000 (Sun, 15 Mar 2009) Log Message: ----------- dovecot: added cswusergroup, added cmusieve plugin, adjusted config file location Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot Added Paths: ----------- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup Removed Paths: ------------- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-15 06:17:09 UTC (rev 3771) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-15 23:01:36 UTC (rev 3772) @@ -1,6 +1,3 @@ -# TODO -# * Build and package Dovecot Sieve plugin http://wiki.dovecot.org/LDA/Sieve - GARNAME = dovecot GARVERSION = 1.1.11 CATEGORIES = server @@ -15,7 +12,6 @@ MASTER_SITES = http://dovecot.org/releases/1.1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWdovecot.preinstall PACKAGES = CSWdovecot CSWdovecotdevel CATALOGNAME_CSWdovecotdevel = dovecot_devel @@ -23,9 +19,9 @@ SPKG_SOURCEURL = http://dovecot.org/ SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecotdevel = Dovecot secure IMAP server header files -SPKG_CLASSES_CSWdovecot = none cswcpsampleconf cswinitsmf +SPKG_CLASSES_CSWdovecot = none cswusergroup cswcpsampleconf cswinitsmf -REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt +REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq REQUIRED_PKGS_CSWdovecot += CSWsasl CSWsqlite3 CSWzlib CSWlibnet REQUIRED_PKGS_CSWdovecot += CSWbzip2 CSWiconv CSWcswclassutils REQUIRED_PKGS_CSWdovecotdevel = CSWdovecot @@ -47,25 +43,30 @@ # See http://dovecot.org/list/dovecot/2009-February/037273.html PATCHFILES = patch-authcrash.diff +# Override some paths for configure +localstatedir=/var/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pop3d CONFIGURE_ARGS += --with-lda CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-mysql +CONFIGURE_ARGS += --with-pgsql CONFIGURE_ARGS += --with-sqlite CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-ssldir=/opt/csw/ssl +CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-bzlib CONFIGURE_ARGS += --enable-header-install -CONFIGURE_ARGS += --localstatedir=/var/opt/csw -CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(GARNAME) -EXTRA_LIB = /opt/csw/mysql5/lib/mysql -EXTRA_INC = /opt/csw/mysql5/include/mysql +EXTRA_LIB = /opt/csw/mysql5/lib/mysql /opt/csw/postgresql/lib +EXTRA_INC = /opt/csw/mysql5/include/mysql /opt/csw/postgresql/include STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot PROTOTYPE_FILTER = awk '\ $$$$3 ~ /\/init.d\/cswdovecot$$$$/ { $$$$2 = "cswinitsmf" } \ + $$$$3 ~ /cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ $$$$3 ~ /dovecot.pem.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ $$$$3 ~ /dovecot.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ $$$$3 == "/opt/csw/ssl/certs" { next } \ @@ -74,21 +75,42 @@ include gar/category.mk +# Maybe there is a nicer way to build this via modulations ... +build-and-install-sieveplugin: + @echo + @echo [===== NOW BUILDING extra cmusieve plugin =====] + @echo + @wget -nc http://www.dovecot.org/releases/sieve/dovecot-sieve-1.1.6.tar.gz + @gtar xzf dovecot-sieve-1.1.6.tar.gz + @(cd dovecot-sieve-1.1.6; \ + ./configure $(DIRPATHS) --with-dovecot=../$(WORKSRC); \ + gmake; \ + gmake DESTDIR=$(DESTDIR) install; ) + @rm -rf dovecot-sieve-1.1.6* + post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT +post-install-modulated: CSWDOCS = changelog.CSW README.CSW post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl -post-install-modulated: +post-install-modulated: build-and-install-sieveplugin @ginstall -d $(DOCDEST) @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot @ginstall -d $(SSLDIR)/certs @ginstall -d $(SSLDIR)/private @( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh ) @mv $(SSLDIR)/certs/dovecot.pem $(SSLDIR)/certs/dovecot.pem.CSW @mv $(SSLDIR)/private/dovecot.pem $(SSLDIR)/private/dovecot.pem.CSW @chmod 400 $(SSLDIR)/private/dovecot.pem.CSW - @cp $(DESTDIR)/etc/opt/csw/$(GARNAME)/dovecot-example.conf \ - $(DESTDIR)/etc/opt/csw/$(GARNAME)/dovecot.conf.CSW + @cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \ + $(DESTDIR)$(sysconfdir)/dovecot.conf.CSW @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) + @$(foreach DOC,$(CSWDOCS),\ + ginstall -m 644 $(FILEDIR)/CSWdovecot.$(DOC) $(DOCDEST);) + @cp $(WORKSRC)/doc/mkcert.sh $(DOCDEST) + @cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST) @ginstall -m 755 $(FILEDIR)/CSWdovecot.cswdovecot \ $(DESTDIR)/etc/opt/csw/init.d/cswdovecot + @ginstall -m 644 $(FILEDIR)/CSWdovecot.cswusergroup \ + $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot/cswusergroup @$(MAKECOOKIE) Added: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-03-15 23:01:36 UTC (rev 3772) @@ -0,0 +1,17 @@ +Service user accounts +===================== +The CSWdovecot package will create a service user account (dovecot) for you in +case no user account by this name exists upon installation. This user account +is required for the dovecot login service (and nothing else). + +If you want to use Dovecot for virtual users, you need to create another +service user account (!= dovecot). For background information, see + + http://wiki.dovecot.org/UserIds + +Upgrading +========= +For upgrading information from other IMAP servers or previous Dovecot +versions, see + + http://wiki.dovecot.org/UpgradingDovecot Added: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-03-15 23:01:36 UTC (rev 3772) @@ -0,0 +1,7 @@ +dovecot (1.1.11) REV=2009.03.15 + + * Package adopted again and updated to 1.1.11. + * Tested and validated LDAP interopability with PAM. (Closes: #) + * TBD .... + + -- Sebastian Kayser Sun, 15 Mar 2009 18:19:59 +0100 Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-15 06:17:09 UTC (rev 3771) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-15 23:01:36 UTC (rev 3772) @@ -2,12 +2,19 @@ # License is public domain. # # Taken from http://wiki.dovecot.org/DovecotInit +# Modified for CSW by Sebastian Kayser +# +#FMRI network DAEMON=/opt/csw/sbin/dovecot test -x $DAEMON || exit 1 set -e +CONF=/opt/csw/etc/dovecot/dovecot.conf +CONF_LOCAL=/etc/opt/csw/dovecot/dovecot.conf +[ -f $CONF_LOCAL ] && CONF=$CONF_LOCAL + base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'` pidfile=$base_dir/master.pid @@ -20,7 +27,7 @@ case "$1" in start) echo -n "Starting Dovecot" - $DAEMON + $DAEMON -c $CONF echo "." ;; stop) @@ -47,7 +54,7 @@ kill `cat $pidfile` sleep 1 fi - $DAEMON + $DAEMON -c $CONF echo "." ;; *) Added: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup 2009-03-15 23:01:36 UTC (rev 3772) @@ -0,0 +1 @@ +dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall 2009-03-15 06:17:09 UTC (rev 3771) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall 2009-03-15 23:01:36 UTC (rev 3772) @@ -1,29 +0,0 @@ -#!/bin/sh - -# Test if the dovecot group exist, if not create it -getent group dovecot > /dev/null -if test $? -gt 0 -then - groupadd dovecot > /dev/null - if test $? -eq 0 - then - echo CSWdovecot postinstall: group dovecot has been added - else - echo CSWdovecot postinstall: ERROR: Failed to add group dovecot - exit 1 - fi -fi - -# Test if the dovecot user exist, if not create it -getent passwd dovecot > /dev/null -if test $? -gt 0 -then - useradd -c "Dovecot service user" -g dovecot -d /var/opt/csw/run/dovecot/login -s /bin/false dovecot > /dev/null - if test $? -eq 0 - then - echo CSWdovecot postinstall: user dovecot has been added - else - echo CSWdovecot postinstall: ERROR: Failed to add user dovecot - exit 1 - fi -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 16 04:07:26 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 16 Mar 2009 03:07:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[3773] csw/mgar/pkg Message-ID: Revision: 3773 http://gar.svn.sourceforge.net/gar/?rev=3773&view=rev Author: hson Date: 2009-03-16 03:07:26 +0000 (Mon, 16 Mar 2009) Log Message: ----------- facter: Initial commit Added Paths: ----------- csw/mgar/pkg/facter/ csw/mgar/pkg/facter/branches/ csw/mgar/pkg/facter/tags/ csw/mgar/pkg/facter/trunk/ csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums csw/mgar/pkg/facter/trunk/files/ Property changes on: csw/mgar/pkg/facter/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/facter/trunk/Makefile 2009-03-16 03:07:26 UTC (rev 3773) @@ -0,0 +1,38 @@ +GARNAME = facter +GARVERSION = 1.5.4 +CATEGORIES = apps + +DESCRIPTION = a system fact gatherer +define BLURB + Long description +endef + +MASTER_SITES = http://reductivelabs.com/downloads/facter/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +REQUIRED_PKGS = CSWruby + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +ARCHALL=1 + +CONFIGURE_SCRIPTS = none +BUILD_SCRIPTS = none +TEST_SCRIPTS = none +INSTALL_SCRIPTS = facter + +include gar/category.mk + +configure-none: + @$(MAKECOOKIE) + +test-none: + @$(MAKECOOKIE) + +build-none: + @$(MAKECOOKIE) + +install-facter: + @ginstall -d $(DESTDIR) + (cd $(WORKDIR)/$(DISTNAME); DESTDIR=$(DESTDIR) ruby install.rb) Added: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums (rev 0) +++ csw/mgar/pkg/facter/trunk/checksums 2009-03-16 03:07:26 UTC (rev 3773) @@ -0,0 +1 @@ +0df92b81606f8e23bdd1f2ade597049b download/facter-1.5.4.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 16 04:25:59 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 16 Mar 2009 03:25:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[3774] csw/mgar/pkg Message-ID: Revision: 3774 http://gar.svn.sourceforge.net/gar/?rev=3774&view=rev Author: hson Date: 2009-03-16 03:25:59 +0000 (Mon, 16 Mar 2009) Log Message: ----------- puppet: Initial commit Added Paths: ----------- csw/mgar/pkg/puppet/ csw/mgar/pkg/puppet/branches/ csw/mgar/pkg/puppet/tags/ csw/mgar/pkg/puppet/trunk/ csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd Property changes on: csw/mgar/pkg/puppet/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile (rev 0) +++ csw/mgar/pkg/puppet/trunk/Makefile 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,58 @@ +GARNAME = puppet +GARVERSION = 0.24.7 +CATEGORIES = apps + +DESCRIPTION = a system configuration tool +define BLURB + Long description +endef + +MASTER_SITES = http://reductivelabs.com/downloads/puppet/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES += $(call admfiles,CSWpuppet,preinstall postinstall preremove postremove) +DISTFILES += cswpuppetd cswpuppetd.xml cswpuppetmasterd cswpuppetmasterd.xml +DISTFILES += svc-cswpuppetd svc-cswpuppetmasterd + +REQUIRED_PKGS = CSWfacter + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +ARCHALL=1 + +CONFIGURE_SCRIPTS = none +BUILD_SCRIPTS = none +TEST_SCRIPTS = none +INSTALL_SCRIPTS = puppet + +include gar/category.mk + +configure-none: + @$(MAKECOOKIE) + +test-none: + @$(MAKECOOKIE) + +build-none: + @$(MAKECOOKIE) + +install-puppet: + @ginstall -d $(DESTDIR) + @ginstall -d $(DESTDIR)/etc/opt/csw/puppet + @ginstall -d $(DESTDIR)/var/opt/csw/puppet/run + @ginstall -d $(DESTDIR)/opt/csw/var/svc/manifest + @ginstall -d $(DESTDIR)/opt/csw/lib/svc/method + (cd $(WORKDIR)/$(DISTNAME) ; \ + gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \ + gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \ + DESTDIR=$(DESTDIR) ruby install.rb ; \ + cd $(DESTDIR)$(mandir)/man8 ; \ + gunzip * ) + (cd $(WORKDIR)/$(DISTNAME)/examples/etc/puppet ; \ + for f in *; do \ + if [ -f $$f ] ; then \ + cp $$f $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \ + chmod 644 $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \ + fi \ + done ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums (rev 0) +++ csw/mgar/pkg/puppet/trunk/checksums 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,12 @@ +36f57de5c2e069d04752f0539034227d download/puppet-0.24.7.tgz +a8dc43771843b852f506f1795231d6ee download/CSWpuppet.gspec +11c352613cf14412565f26dde2dc7578 download/CSWpuppet.preinstall +b3a1e3bb293bf607368f3479b288f6eb download/CSWpuppet.postinstall +2465374a83d4fbe6e01b6eac410e62a8 download/CSWpuppet.preremove +2b76d69202476fad006d27d26364e59c download/CSWpuppet.postremove +ecf6aae7bb8bd8ad9e064ed40674a7be download/cswpuppetd +dd10b02543d22bbe66994ef89409f7fd download/cswpuppetd.xml +066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd +38e007c1906fca70bc95dc45b5892581 download/cswpuppetmasterd.xml +ecf6aae7bb8bd8ad9e064ed40674a7be download/svc-cswpuppetd +066f9053e1342b19cf83f3f78ce2259c download/svc-cswpuppetmasterd Added: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,5 @@ +%var bitname puppet +%var pkgname CSWpuppet +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENCE +%include url file://%{PKGLIB}/smf_enabled.gspec Added: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,12 @@ +PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/} +/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet +/usr/bin/test -d \$PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet +/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet +/usr/bin/test -d \$PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet +touch \$PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf +/usr/bin/test -f \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf +/usr/bin/test -f \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +if [ "\$autoenable_daemons" != "no" ] ; then + /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true + /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true +fi Added: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,4 @@ +rm /etc/puppet || /bin/true +rm /opt/csw/etc/puppet || /bin/true +rm /var/puppet || /bin/true +rm /opt/csw/var/puppet || /bin/true Added: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,6 @@ +PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/} +\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent group puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/groupadd puppet +\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet + +mkdir -p \$PKG_INSTALL_ROOT/etc/opt/csw/puppet +chown root:bin \$PKG_INSTALL_ROOT/etc/opt/csw/puppet Added: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove =================================================================== --- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,2 @@ +/usr/sbin/svcadm disable svc:network/puppetd 2>/dev/null || /bin/true +/usr/sbin/svccfg delete svc:network/puppetd || /bin/true Added: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,66 @@ +#!/bin/sh +# This is the /etc/init.d file for puppetd +# Modified for CSW +# +# description: puppetd - Puppet Automation Client +# + +. /lib/svc/share/smf_include.sh + +prefix=/opt/csw +exec_prefix=/opt/csw +sysconfdir=/opt/csw/etc +sbindir=/opt/csw/bin + +pidfile=/var/opt/csw/puppet/run/puppetd.pid + +case "$1" in +start) + cd / + # Start daemons. + + printf "Starting Puppet client services:" + + /opt/csw/bin/puppetd + + printf " puppetd" + echo "" + ;; +stop) + printf "Stopping Puppet client services:" + kill `cat $pidfile` + + printf " puppetd" + echo "" + ;; +restart) + printf "Restarting Puppet client services:" + kill -HUP `cat $pidfile` + + printf " puppetd" + echo "" + ;; +reload) + printf "Reloading Puppet client services:" + + kill -HUP `cat $pidfile` + + printf " puppetd" + echo "" + ;; +status) + if [ -f $pidfile ]; then + pid=`cat $pidfile` + curpid=`pgrep puppetd` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi + else + exit 1 + fi +esac +exit 0 + +# $Id$ Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetd ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,62 @@ +#!/bin/sh +# + +. /lib/svc/share/smf_include.sh + +prefix=/opt/csw +exec_prefix=/opt/csw +sysconfdir=/opt/csw/etc +sbindir=/opt/csw/sbin + +pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid + +case "$1" in +start) + cd / + # Start daemons. + + printf "Starting Puppet server services:" + + /opt/csw/bin/puppetmasterd + + printf " puppetmaster" + echo "" + ;; +stop) + printf "Stopping Puppet server services:" + kill `cat $pidfile` + + printf " puppetmasterd" + echo "" + ;; +restart) + printf "Restarting Puppet server services:" + kill -HUP `cat $pidfile` + + printf " puppetmasterd" + echo "" + ;; +reload) + printf "Reloading Puppet server services:" + + kill -HUP `cat $pidfile` + + printf " puppetmasterd" + echo "" + ;; +status) + if [ -f $pidfile ]; then + pid=`cat $pidfile` + curpid=`pgrep puppetmasterd` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi + else + exit 1 + fi +esac +exit 0 + +# $Id$ Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,66 @@ +#!/bin/sh +# This is the /etc/init.d file for puppetd +# Modified for CSW +# +# description: puppetd - Puppet Automation Client +# + +. /lib/svc/share/smf_include.sh + +prefix=/opt/csw +exec_prefix=/opt/csw +sysconfdir=/opt/csw/etc +sbindir=/opt/csw/bin + +pidfile=/var/opt/csw/puppet/run/puppetd.pid + +case "$1" in +start) + cd / + # Start daemons. + + printf "Starting Puppet client services:" + + /opt/csw/bin/puppetd + + printf " puppetd" + echo "" + ;; +stop) + printf "Stopping Puppet client services:" + kill `cat $pidfile` + + printf " puppetd" + echo "" + ;; +restart) + printf "Restarting Puppet client services:" + kill -HUP `cat $pidfile` + + printf " puppetd" + echo "" + ;; +reload) + printf "Reloading Puppet client services:" + + kill -HUP `cat $pidfile` + + printf " puppetd" + echo "" + ;; +status) + if [ -f $pidfile ]; then + pid=`cat $pidfile` + curpid=`pgrep puppetd` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi + else + exit 1 + fi +esac +exit 0 + +# $Id$ Property changes on: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd (rev 0) +++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-03-16 03:25:59 UTC (rev 3774) @@ -0,0 +1,62 @@ +#!/bin/sh +# + +. /lib/svc/share/smf_include.sh + +prefix=/opt/csw +exec_prefix=/opt/csw +sysconfdir=/opt/csw/etc +sbindir=/opt/csw/sbin + +pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid + +case "$1" in +start) + cd / + # Start daemons. + + printf "Starting Puppet server services:" + + /opt/csw/bin/puppetmasterd + + printf " puppetmaster" + echo "" + ;; +stop) + printf "Stopping Puppet server services:" + kill `cat $pidfile` + + printf " puppetmasterd" + echo "" + ;; +restart) + printf "Restarting Puppet server services:" + kill -HUP `cat $pidfile` + + printf " puppetmasterd" + echo "" + ;; +reload) + printf "Reloading Puppet server services:" + + kill -HUP `cat $pidfile` + + printf " puppetmasterd" + echo "" + ;; +status) + if [ -f $pidfile ]; then + pid=`cat $pidfile` + curpid=`pgrep puppetmasterd` + if [ "$pid" -eq "$curpid" ]; then + exit 0 + else + exit 1 + fi + else + exit 1 + fi +esac +exit 0 + +# $Id$ Property changes on: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Mar 16 11:47:24 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 16 Mar 2009 10:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[3775] csw/mgar/pkg Message-ID: Revision: 3775 http://gar.svn.sourceforge.net/gar/?rev=3775&view=rev Author: j_arndt Date: 2009-03-16 10:47:24 +0000 (Mon, 16 Mar 2009) Log Message: ----------- pnp: initial commit Added Paths: ----------- csw/mgar/pkg/pnp/ csw/mgar/pkg/pnp/branches/ csw/mgar/pkg/pnp/tags/ csw/mgar/pkg/pnp/trunk/ csw/mgar/pkg/pnp/trunk/Makefile csw/mgar/pkg/pnp/trunk/checksums csw/mgar/pkg/pnp/trunk/files/ csw/mgar/pkg/pnp/trunk/files/CSWpnp.gspec csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype csw/mgar/pkg/pnp/trunk/files/cswpnp csw/mgar/pkg/pnp/trunk/files/makefile.diff csw/mgar/pkg/pnp/trunk/files/npcd.diff Property changes on: csw/mgar/pkg/pnp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pnp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pnp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pnp/trunk/Makefile 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,140 @@ +GARNAME = pnp +GARVERSION = 0.4.13 +CATEGORIES = apps + +DESCRIPTION = Analyzing Nagios performance data with RRD databases. +define BLURB + PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases +endef + +SF_PROJ = pnp4nagios +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpnp, prototype ) +DISTFILES += cswpnp +#DISTFILES += cswpnp cswpnp.xml svc-cswpnp + +PATCHFILES += makefile.diff +PATCHFILES += npcd.diff + +# We define upstream file regex so we can be notifed of new upstream software release +#UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +LDFLAGS += -L/usr/ucblib +LIBS += -lucb + +datadir = /opt/csw/nagios/share/pnp +sysconfdir = $(prefix)/nagios/etc/pnp +bindir = $(prefix)/nagios/bin +libexecdir = $(prefix)/libexec/nagios-plugins + +REQUIRED_PKGS_sparc = SUNWscpux +REQUIRED_PKGS_i386 = SUNWscpu +REQUIRED_PKGS = CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd $(REQUIRED_PKGS_$(GARCH)) CSWcswclassutils +SPKG_CLASSES = none cswinitsmf + +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswpnp$$$$/ { $$$$2 = "cswinitsmf" } { print }' + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-perl_lib_path=/opt/csw/lib/perl/csw +CONFIGURE_ARGS += --with-perfdata-logfile=/opt/csw/nagios/var/perfdata.log +CONFIGURE_ARGS += --with-perfdata-dir=/opt/csw/nagios/share/perfdata +CONFIGURE_ARGS += --with-perfdata-spool-dir=/opt/csw/var/spool/perfdata +CONFIGURE_ARGS += --htmldir=/opt/csw/nagios/share/pnp + +BUILD_ARGS = all +TEST_SCRIPTS = + +INSTALL_SCRIPTS = base-custom +INSTALL_SCRIPTS += html-custom +INSTALL_SCRIPTS += scripts-custom +INSTALL_SCRIPTS += config-custom +INSTALL_SCRIPTS += contrib-custom + +include gar/category.mk + +DATAROOTDIR = $(datadir) +CONTRIBDIR = $(DATAROOTDIR)/contrib +SYSCONFDIR = $(sysconfdir) +LIBEXECDIR = $(libexecdir) +BINDIR = $(bindir) +PERFDATA_SPOOL_DIR=/opt/csw/nagios/var/spool/perfdata/ +PERFDATADIR = /opt/csw/nagios/share/perfdata + +install-base-custom: + @echo "$(GARCH)" + @echo "$(GARCH)" + @echo "$(GARCH)" + @ginstall -m 755 -d $(DESTDIR)$(BINDIR) + @ginstall -m 755 -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) + @ginstall -m 754 $(WORKSRC)/src/npcd $(DESTDIR)$(BINDIR) + @ginstall -m 754 $(WORKSRC)/src/npcdmod $(DESTDIR)$(BINDIR) + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/cswpnp $(DESTDIR)/etc/opt/csw/init.d/cswpnp + +install-html-custom: + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR) + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/images + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/include + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/include/font + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/include/font/makefont + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/include/js + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/lang/ + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/templates/ + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/templates.dist/ + @ginstall -m 755 -d $(DESTDIR)$(DATAROOTDIR)/templates.special/ + for file in $(WORKSRC)/share/pnp/*.php; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR); done + for file in $(WORKSRC)/share/pnp/templates.dist/*.php; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/templates.dist; done + for file in $(WORKSRC)/share/pnp/templates.special/*.php; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/templates.special; done + for file in $(WORKSRC)/share/pnp/lang/*.php; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/lang; done + for file in $(WORKSRC)/share/pnp/images/*; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/images; done + for file in $(WORKSRC)/share/pnp/include/*.*; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/include; done + for file in $(WORKSRC)/share/pnp/include/js/*; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/include/js; done + for file in $(WORKSRC)/share/pnp/include/font/*.php; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/include/font; done + for file in $(WORKSRC)/share/pnp/include/font/makefont/*; \ + do ginstall -m 644 $$file $(DESTDIR)$(DATAROOTDIR)/include/font/makefont; done + +install-scripts-custom: + @ginstall -m 755 -d $(DESTDIR)$(PERFDATADIR) + @ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR) + @ginstall -m 755 $(WORKSRC)/scripts/process_perfdata.pl $(DESTDIR)$(LIBEXECDIR) + #@ginstall -m 755 $(WORKSRC)/scripts/pcheck_pnp_rrds.pl $(DESTDIR)$(LIBEXECDIR) + +install-config-custom: + -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php + @ginstall -m 755 -d $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 755 -d $(DESTDIR)$(SYSCONFDIR)/check_commands + @ginstall -m 755 -d $(DESTDIR)$(SYSCONFDIR)/pages + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/config.php $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/background.pdf $(DESTDIR)$(SYSCONFDIR) + -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php + @ginstall -m 755 -d $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 755 -d $(DESTDIR)$(SYSCONFDIR)/check_commands + @ginstall -m 755 -d $(DESTDIR)$(SYSCONFDIR)/pages + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/config.php $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR) + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(SYSCONFDIR)/pages + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg + +install-contrib-custom: + @ginstall -m 755 -d $(DESTDIR)$(CONTRIBDIR) + @ginstall -m 755 -d $(DESTDIR)$(CONTRIBDIR)/ssi + @ginstall -m 644 $(WORKSRC)/contrib/makeserviceextinfo.pl $(DESTDIR)$(CONTRIBDIR) + @ginstall -m 644 $(WORKSRC)/contrib/verify_pnp_config $(DESTDIR)$(CONTRIBDIR) + @ginstall -m 644 $(WORKSRC)/contrib/verify_pnp_config.txt $(DESTDIR)$(CONTRIBDIR) + @ginstall -m 644 $(WORKSRC)/contrib/ssi/status-header.ssi $(DESTDIR)$(CONTRIBDIR)/ssi Added: csw/mgar/pkg/pnp/trunk/checksums =================================================================== --- csw/mgar/pkg/pnp/trunk/checksums (rev 0) +++ csw/mgar/pkg/pnp/trunk/checksums 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,5 @@ +20a96f81edba29dcd21215bde4af8b57 download/pnp-0.4.13.tar.gz +216b8ed50919642c3fae2a6520724dd3 download/CSWpnp.gspec +e96576b61cabf446d0d38bd19a45b2b8 download/CSWpnp.prototype +30e8699531bb0249542b3012a00a73b1 download/makefile.diff +b1229d599c2ce12c3aacf0a44e1588d6 download/npcd.diff Added: csw/mgar/pkg/pnp/trunk/files/CSWpnp.gspec =================================================================== --- csw/mgar/pkg/pnp/trunk/files/CSWpnp.gspec (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.gspec 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,3 @@ +%var bitname pnp +%var pkgname CSWpnp +%include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype =================================================================== --- csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,167 @@ +d none /opt/csw/nagios 0755 root bin +d none /opt/csw/nagios/bin 0755 nagios nagios +f none /opt/csw/nagios/bin/npcd 0754 nagios nagios +f none /opt/csw/nagios/bin/npcdmod 0754 nagios nagios +d none /opt/csw/nagios/etc/pnp 0755 nagios nagios +f none /opt/csw/nagios/etc/pnp/background.pdf 0644 nagios nagios +d none /opt/csw/nagios/etc/pnp/check_commands 0755 nagios nagios +f none /opt/csw/nagios/etc/pnp/check_commands/check_nwstat.cfg-sample 0644 nagios nagios +f none /opt/csw/nagios/etc/pnp/config.php 0644 nagios nagios +f none /opt/csw/nagios/etc/pnp/npcd.cfg 0644 nagios nagios +d none /opt/csw/nagios/etc/pnp/pages 0755 nagios nagios +f none /opt/csw/nagios/etc/pnp/pages/web_traffic.cfg-sample 0644 nagios nagios +f none /opt/csw/nagios/etc/pnp/pnp4nagios_release 0644 nagios nagios +f none /opt/csw/nagios/etc/pnp/process_perfdata.cfg-sample 0644 nagios nagios +f none /opt/csw/nagios/etc/pnp/rra.cfg-sample 0644 nagios nagios +d none /opt/csw/libexec/nagios-plugins 0755 root bin +f none /opt/csw/libexec/nagios-plugins/process_perfdata.pl 0755 root bin +d none /opt/csw/nagios/share 0755 nagios nagios +d none /opt/csw/nagios/share/perfdata 0755 nagios nagios +d none /opt/csw/nagios/share/pnp 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/ajax.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/images 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/images/ack.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/action.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/calendar.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/critical.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/eps.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/graph.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/int.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/int2.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/link.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/noack.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/notify.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/ok.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/pages.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/pdf.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/pnp.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/recovery.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/rrdtool.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/svg.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/trends.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/warning.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/xml.png 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/images/zoom.png 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/include 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/include/debug.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/include/font 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/courier.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/helvetica.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/helveticab.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/helveticabi.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/helveticai.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/include/font/makefont 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1250.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1251.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1252.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1253.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1254.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1255.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1257.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp1258.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/cp874.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-1.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-11.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-15.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-16.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-2.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-4.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-5.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-7.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/iso-8859-9.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/koi8-r.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/koi8-u.map 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/makefont/makefont.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/symbol.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/times.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/timesb.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/timesbi.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/timesi.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/font/zapfdingbats.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/fpdf.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/fpdf_tpl.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/fpdi.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/fpdi_pdf_parser.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/function.inc.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/include/js 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/builder.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/calendar-blue.css 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/calendar-de.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/calendar-en.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/calendar-setup.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/calendar.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/controls.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/dragdrop.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/effects.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/menuarrow.gif 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/overlib_mini.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/prototype.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/scriptaculous.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/slider.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/sound.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/unittest.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/js/zoom.js 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/pdf_context.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/pdf_parser.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/site.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/style.css 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/tpl_function.inc.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/include/wrapper_functions.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/index.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/lang 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/lang/lang_de.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/lang/lang_en.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/lang/lang_fr.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/lang/lang_nl.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/lang/lang_se.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/templates 0755 nagios nagios +d none /opt/csw/nagios/share/pnp/templates.dist 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check-host-alive.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_disk.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_dns.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_fping.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_http.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_http_url.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_iftraffic_counter.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_iftraffic_pct.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_load.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_messpc_temp.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_multi.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nt_cpu.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nt_disk.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nt_mem.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nwstat_CONNS.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nwstat_LOAD.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nwstat_LOAD1.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nwstat_LOAD15.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nwstat_LOAD5.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_nwstat_ofiles.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_oracle_connection-time.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_oracle_health_connection-time.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_oracle_health_pga-in-memory-sort-ratio.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_oracle_health_redo-io-traffic.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_oracle_health_switch-interval.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_oracle_health_tablespace-usage.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_ping.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_pnp_rrds.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_smtp.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_snmp_int-bits.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_snmp_int.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_swap.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_tcp.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/check_users.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/default.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.dist/response.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/templates.special 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/templates.special/loop.php 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/zoom.php 0644 nagios nagios +d none /opt/csw/nagios/share/pnp/contrib 0755 nagios nagios +d none /opt/csw/nagios/share/pnp/contrib/ssi 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/contrib/makeserviceextinfo.pl 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/contrib/verify_pnp_config 0755 nagios nagios +f none /opt/csw/nagios/share/pnp/contrib/verify_pnp_config.txt 0644 nagios nagios +f none /opt/csw/nagios/share/pnp/contrib/ssi/status-header.ssi 0644 nagios nagios +d none /opt/csw/nagios/var 0755 nagios nagios +d none /opt/csw/nagios/var/spool 0755 nagios nagios +d none /opt/csw/nagios/var/spool/perfdata 0755 nagios nagios +f cswinitsmf /etc/opt/csw/init.d/cswpnp 0755 root bin Added: csw/mgar/pkg/pnp/trunk/files/cswpnp =================================================================== --- csw/mgar/pkg/pnp/trunk/files/cswpnp (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/cswpnp 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,52 @@ +#!/bin/sh +# +# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. +# All rights reserved. +# +#ident "@(#)pnp 1.19 01/12/05 SMI" +# Modified for CSW by Alex Moore 2005-12-03 +# 2007-08-18 Add pid file support. +# 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. +# 2009-03-08 Fix for "user = nagios" and awk + +CONFIG_FILE=/etc/opt/csw/pnp.cfg +if [ ! -f $CONFIG_FILE ] ; then + CONFIG_FILE=/opt/csw/nagios/etc/pnp/npcd.cfg +fi +BIN_FILE="/opt/csw/nagios/bin/npcd" +pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` +PNP_USER=`awk '/^user/ { print $NF }' $CONFIG_FILE` + +case "$1" in +'restart') + [ -n "`pgrep -x -u 0,1,$PNP_USER npcd`" ] && /usr/bin/kill `head -1 $pidfile` + # remove pid file + if [ -f "$pidfile" ]; then + rm "$pidfile" + fi + if [ -f $CONFIG_FILE ]; then + wait 1 + $BIN_FILE -c $CONFIG_FILE -d + fi + ;; + +'start') + if [ -f $CONFIG_FILE ]; then + $BIN_FILE -c $CONFIG_FILE -d + fi + ;; + +'stop') + [ -n "`pgrep -x -u 0,1,$PNP_USER npcd`" ] && /usr/bin/kill `head -1 $pidfile` + # remove pid file + if [ -f "$pidfile" ]; then + rm "$pidfile" + fi + ;; + +*) + echo "Usage: $0 { start | stop | restart }" + exit 1 + ;; +esac +exit 0 Added: csw/mgar/pkg/pnp/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/makefile.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/makefile.diff 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,43 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.13.orig/src/Makefile.in pnp-0.4.13/src/Makefile.in +--- pnp-0.4.13.orig/src/Makefile.in 2009-02-19 18:28:41.000000000 +0100 ++++ pnp-0.4.13/src/Makefile.in 2009-03-04 20:55:35.296449068 +0100 +@@ -9,7 +9,7 @@ + SRC_INCLUDE=../include + + CC=@CC@ +-CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE ++CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE -L/usr/ucblib -R/usr/ucblib -lucb + + # Compiler flags for use with Valgrind + #CFLAGS=-O0 -g -DHAVE_CONFIG_H -DNSCORE +@@ -52,7 +52,7 @@ + + OBJDEPS= + +-all: npcd npcdmod.o ++all: npcd npcdmod + + # Required Objects + +@@ -87,8 +87,8 @@ + # NPCDMOD + # + ############################### +-npcdmod.o: npcdmod.c +- $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC ++npcdmod: npcdmod.c ++ $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC + + ############################### + # +@@ -124,8 +124,8 @@ + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) + $(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod $(DESTDIR)$(BINDIR) + + strip-post-install: + $(STRIP) $(DESTDIR)$(BINDIR)/@npcd_name@ +- $(STRIP) $(DESTDIR)$(BINDIR)/npcdmod.o ++ $(STRIP) $(DESTDIR)$(BINDIR)/npcdmod Added: csw/mgar/pkg/pnp/trunk/files/npcd.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/npcd.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/npcd.diff 2009-03-16 10:47:24 UTC (rev 3775) @@ -0,0 +1,15 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.13.orig/src/npcd.c pnp-0.4.13/src/npcd.c +--- pnp-0.4.13.orig/src/npcd.c 2009-02-19 18:28:41.000000000 +0100 ++++ pnp-0.4.13/src/npcd.c 2009-03-04 20:39:15.803376720 +0100 +@@ -56,6 +56,11 @@ + const char *directory = NULL; + const char progname[5] = "npcd"; + ++int alphasort(const struct dirent **a, const struct dirent **b) ++{ ++ return(strcmp((*a)->d_name, (*b)->d_name)); ++} ++ + static void start_daemon(const char *log_name, int facility) { + int i; + pid_t pid; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 16 16:45:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Mar 2009 15:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[3776] csw/mgar/pkg/template/trunk Message-ID: Revision: 3776 http://gar.svn.sourceforge.net/gar/?rev=3776&view=rev Author: dmichelsen Date: 2009-03-16 15:45:10 +0000 (Mon, 16 Mar 2009) Log Message: ----------- template: Update for mGAR v2 Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/template/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/template/trunk/files/CSWpackage.gspec Property Changed: ---------------- csw/mgar/pkg/template/trunk/ Property changes on: csw/mgar/pkg/template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-03-16 10:47:24 UTC (rev 3775) +++ csw/mgar/pkg/template/trunk/Makefile 2009-03-16 15:45:10 UTC (rev 3776) @@ -1,15 +1,14 @@ -GARNAME = PACKAGE +GARNAME = mypkg GARVERSION = 1.0 -CATEGORIES = CATEGORY +CATEGORIES = lib -DESCRIPTION = BRIEF DESCRIPTION +DESCRIPTION = This is a useful library define BLURB - LONG DESCRIPTION + It does stuff with things endef MASTER_SITES = DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/template/trunk/files/CSWpackage.gspec =================================================================== --- csw/mgar/pkg/template/trunk/files/CSWpackage.gspec 2009-03-16 10:47:24 UTC (rev 3775) +++ csw/mgar/pkg/template/trunk/files/CSWpackage.gspec 2009-03-16 15:45:10 UTC (rev 3776) @@ -1,4 +0,0 @@ -%var bitname package -%var pkgname CSWpackage -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Mar 16 21:22:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Mar 2009 20:22:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3777] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 3777 http://gar.svn.sourceforge.net/gar/?rev=3777&view=rev Author: dmichelsen Date: 2009-03-16 20:22:01 +0000 (Mon, 16 Mar 2009) Log Message: ----------- mGAR v2: Use correct libdir for gcc on 64 bit ISAs Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-03-16 15:45:10 UTC (rev 3776) +++ csw/mgar/gar/v2/gar.conf.mk 2009-03-16 20:22:01 UTC (rev 3777) @@ -399,8 +399,8 @@ GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) -GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) -GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) +GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) +GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Mon Mar 16 23:19:09 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Mon, 16 Mar 2009 22:19:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3778] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 3778 http://gar.svn.sourceforge.net/gar/?rev=3778&view=rev Author: harpchad Date: 2009-03-16 22:19:09 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Update to version 2.6.4 Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.i csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.s csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.i csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.s Removed Paths: ------------- csw/mgar/pkg/gnutls/trunk/files/CSWgnutls.gspec Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-16 20:22:01 UTC (rev 3777) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-16 22:19:09 UTC (rev 3778) @@ -1,5 +1,5 @@ GARNAME = gnutls -GARVERSION = 2.6.3 +GARVERSION = 2.6.4 CATEGORIES = lib DESCRIPTION = GNU Transport Layer Security lib and tools @@ -9,23 +9,40 @@ library implements the proposed standards by the IETF's TLS working group. endef -MASTER_SITES = http://ftp.gnu.org/pub/gnu/gnutls/ +MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWgnutls,) +DISTFILES += libgnutls-openssl.so.13.i +DISTFILES += libgnutls-openssl.so.13.s +DISTFILES += libgnutls.so.13.i +DISTFILES += libgnutls.so.13.s +GARCOMPILER = GNU + SPKG_SOURCEURL = http://www.gnu.org/software/gnutls/ # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -REQUIRED_PKGS = - -BUILD64 = 1 +#Waiting on gcc4 for amd64 +#BUILD64 = 1 +EXTRA_BUILD_ISAS_sparc = sparcv9 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +REQUIRED_PKGS_CSWgnutls = CSWgcc4corert CSWgcc4g++rt CSWgcrypt CSWggettextrt +REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib + include gar/category.mk +post-install-isa-sparcv8: + @cp $(FILEDIR)/libgnutls.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls.so.13 + @cp $(FILEDIR)/libgnutls-openssl.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls-openssl.so.13 + $(DONADA) + +post-install-isa-i386: + @cp $(FILEDIR)/libgnutls.so.13.i $(INSTALLISADIR)/opt/csw/lib/libgnutls.so.13 + @cp $(FILEDIR)/libgnutls-openssl.so.13.i $(INSTALLISADIR)/opt/csw/lib/libgnutls-openssl.so.13 + $(DONADA) Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2009-03-16 20:22:01 UTC (rev 3777) +++ csw/mgar/pkg/gnutls/trunk/checksums 2009-03-16 22:19:09 UTC (rev 3778) @@ -1,2 +1,5 @@ -c6d2d1996b87b238ad6f73f92225d9a2 download/gnutls-2.6.3.tar.bz2 -d362175027f696f65f81eca9ee7a5bb1 download/CSWgnutls.gspec +747111ab0d86e7b06a4bb120ba456ad8 download/gnutls-2.6.4.tar.bz2 +073c509902375c40b885f5adc9f7dba9 download/libgnutls-openssl.so.13.i +02e4011d400d262b8d4b5c7311d8a5b0 download/libgnutls-openssl.so.13.s +b0eee0d29e3d260a146e626c6ca75b16 download/libgnutls.so.13.i +76f0d841ec6c4a3612ca2410c793e104 download/libgnutls.so.13.s Deleted: csw/mgar/pkg/gnutls/trunk/files/CSWgnutls.gspec =================================================================== --- csw/mgar/pkg/gnutls/trunk/files/CSWgnutls.gspec 2009-03-16 20:22:01 UTC (rev 3777) +++ csw/mgar/pkg/gnutls/trunk/files/CSWgnutls.gspec 2009-03-16 22:19:09 UTC (rev 3778) @@ -1,4 +0,0 @@ -%var bitname gnutls -%var pkgname CSWgnutls -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.s ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.s ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 16 23:49:43 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 16 Mar 2009 22:49:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[3779] csw/mgar/pkg Message-ID: Revision: 3779 http://gar.svn.sourceforge.net/gar/?rev=3779&view=rev Author: valholla Date: 2009-03-16 22:49:42 +0000 (Mon, 16 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/libedit/ csw/mgar/pkg/libedit/trunk/ csw/mgar/pkg/libedit/trunk/files/ csw/mgar/pkg/libedit/trunk/files/libedit.diff Added: csw/mgar/pkg/libedit/trunk/files/libedit.diff =================================================================== --- csw/mgar/pkg/libedit/trunk/files/libedit.diff (rev 0) +++ csw/mgar/pkg/libedit/trunk/files/libedit.diff 2009-03-16 22:49:42 UTC (rev 3779) @@ -0,0 +1,41 @@ +--- libedit/TEST/test.c.o 2009-03-16 17:27:46.460913213 -0500 ++++ libedit/TEST/test.c 2009-03-16 17:27:59.468294283 -0500 +@@ -36,7 +36,6 @@ + * SUCH DAMAGE. + */ + +-#include + #include "compat.h" + #ifndef lint + __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\ +--- libedit/Makefile.in.o 2009-03-16 17:34:53.186197841 -0500 ++++ libedit/Makefile.in 2009-03-16 17:38:03.934807464 -0500 +@@ -109,17 +109,17 @@ + common.h emacs.h fcns.h help.h vi.h + + install: libedit.a libedit.so +- ${INSTALL} -d ${LIBDIR} +- ${INSTALL} libedit.a ${LIBDIR} +- ${INSTALL} libedit.so ${LIBDIR} +- ${INSTALL} -d ${INCDIR} +- ${INSTALL} -m 644 histedit.h ${INCDIR} +- ${INSTALL} -d ${INCDIR}/readline/ +- ${INSTALL} -m 644 readline/readline.h ${INCDIR}/readline/ +- ${INSTALL} -d ${MANDIR}/man3/ +- ${INSTALL} -m 644 editline.3 ${MANDIR}/man3/ +- ${INSTALL} -d ${MANDIR}/man5/ +- ${INSTALL} -m 644 editrc.5 ${MANDIR}/man5/ ++ ${INSTALL} -d ${DESTDIR}/${LIBDIR} ++ ${INSTALL} libedit.a ${DESTDIR}/${LIBDIR} ++ ${INSTALL} libedit.so ${DESTDIR}/${LIBDIR} ++ ${INSTALL} -d ${DESTDIR}/${INCDIR} ++ ${INSTALL} -m 644 histedit.h ${DESTDIR}/${INCDIR} ++ ${INSTALL} -d ${DESTDIR}/${INCDIR}/readline/ ++ ${INSTALL} -m 644 readline/readline.h ${DESTDIR}/${INCDIR}/readline/ ++ ${INSTALL} -d ${DESTDIR}/${MANDIR}/man3/ ++ ${INSTALL} -m 644 editline.3 ${DESTDIR}/${MANDIR}/man3/ ++ ${INSTALL} -d ${DESTDIR}/${MANDIR}/man5/ ++ ${INSTALL} -m 644 editrc.5 ${DESTDIR}/${MANDIR}/man5/ + + clean: + rm -f *.o This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Mar 16 23:51:20 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 16 Mar 2009 22:51:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[3780] csw/mgar/pkg/libedit/trunk/ Message-ID: Revision: 3780 http://gar.svn.sourceforge.net/gar/?rev=3780&view=rev Author: valholla Date: 2009-03-16 22:51:20 +0000 (Mon, 16 Mar 2009) Log Message: ----------- set gar to v2 Property Changed: ---------------- csw/mgar/pkg/libedit/trunk/ Property changes on: csw/mgar/pkg/libedit/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Mar 17 00:03:01 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 16 Mar 2009 23:03:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3781] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 3781 http://gar.svn.sourceforge.net/gar/?rev=3781&view=rev Author: wbonnet Date: 2009-03-16 23:03:00 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Add 64 bit binaries Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-16 22:51:20 UTC (rev 3780) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-16 23:03:00 UTC (rev 3781) @@ -30,8 +30,8 @@ # Build the 64 bits binaries BUILD64 = 1 NO_ISAEXEC = 1 -EXTRA_BUILD_ISAS_sparc = sparcv8 sparcv9 -EXTRA_BUILD_ISAS_i386 = i386 amd64 +EXTRA_BUILD_ISAS_sparc = sparcv9 +EXTRA_BUILD_ISAS_i386 = amd64 # Add some patches to the sources PATCHFILES = gar-base.diff @@ -40,9 +40,7 @@ TEST_SCRIPTS = none # Make configure options -CONFIGURE_ARGS += --prefix=$(prefix) -CONFIGURE_ARGS += --mandir=$(mandir) -CONFIGURE_ARGS += --infodir=$(infodir) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threadsafe --disable-debug #REQUIRED_PKGS_CSWlibxcbdevel = CSWlibxcb This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Mar 17 00:18:11 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Mon, 16 Mar 2009 23:18:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[3782] csw/mgar/pkg/gnutls/trunk/Makefile Message-ID: Revision: 3782 http://gar.svn.sourceforge.net/gar/?rev=3782&view=rev Author: harpchad Date: 2009-03-16 23:18:11 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Add CSWiconv as a required package Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-16 23:03:00 UTC (rev 3781) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-16 23:18:11 UTC (rev 3782) @@ -33,7 +33,7 @@ TEST_TARGET = check REQUIRED_PKGS_CSWgnutls = CSWgcc4corert CSWgcc4g++rt CSWgcrypt CSWggettextrt -REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib +REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib CSWiconv include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Mar 17 00:19:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 16 Mar 2009 23:19:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3783] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 3783 http://gar.svn.sourceforge.net/gar/?rev=3783&view=rev Author: wbonnet Date: 2009-03-16 23:19:31 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Add 64 bit binaries Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-16 23:18:11 UTC (rev 3782) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-16 23:19:31 UTC (rev 3783) @@ -31,7 +31,6 @@ BUILD64 = 1 NO_ISAEXEC = 1 EXTRA_BUILD_ISAS_sparc = sparcv9 -EXTRA_BUILD_ISAS_i386 = amd64 # Add some patches to the sources PATCHFILES = gar-base.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej.blizinski at gmail.com Tue Mar 17 01:29:18 2009 From: maciej.blizinski at gmail.com (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 17 Mar 2009 00:29:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3773] csw/mgar/pkg In-Reply-To: References: Message-ID: Hi Roger, A handful of comments below. On Mon, Mar 16, 2009 at 3:07 AM, wrote: > Revision: 3773 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=3773&view=rev > Author: ? hson > Date: ? ? 2009-03-16 03:07:26 +0000 (Mon, 16 Mar 2009) > > Log Message: > ----------- > facter: Initial commit > > Added Paths: > ----------- > ? ?csw/mgar/pkg/facter/ > ? ?csw/mgar/pkg/facter/branches/ > ? ?csw/mgar/pkg/facter/tags/ > ? ?csw/mgar/pkg/facter/trunk/ > ? ?csw/mgar/pkg/facter/trunk/Makefile > ? ?csw/mgar/pkg/facter/trunk/checksums > ? ?csw/mgar/pkg/facter/trunk/files/ > > > Property changes on: csw/mgar/pkg/facter/trunk > ___________________________________________________________________ > Added: svn:ignore > ? + cookies > download > work > > > Added: svn:externals > ? + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 > > > Added: csw/mgar/pkg/facter/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/facter/trunk/Makefile ? ? ? ? ? ? ? ? ? ? ? ? ?(rev 0) > +++ csw/mgar/pkg/facter/trunk/Makefile ?2009-03-16 03:07:26 UTC (rev 3773) > @@ -0,0 +1,38 @@ > +GARNAME = facter > +GARVERSION = 1.5.4 > +CATEGORIES = apps > + > +DESCRIPTION = ?a system fact gatherer > +define BLURB > + ?Long description > +endef The blurb could be: define BLURB - Long description + http://reductivelabs.com/products/facter/ + + A cross-platform Ruby library for retrieving facts from operating systems. + Supports multiple resolution mechanisms, any of which can be restricted to + working only on certain operating systems or environments. Facter is + especially useful for retrieving things like operating system names, IP + addresses, MAC addresses, and SSH keys. + + It is easy to extend Facter to include your own custom facts or to include + additional mechanisms for retrieving facts. endef > + > +MASTER_SITES = http://reductivelabs.com/downloads/facter/ > +DISTFILES ?= $(GARNAME)-$(GARVERSION).tgz > + > +REQUIRED_PKGS = CSWruby > + > +# We define upstream file regex so we can be notifed of new upstream software release > +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz > + > +ARCHALL=1 > + > +CONFIGURE_SCRIPTS = none > +BUILD_SCRIPTS ? ? = none > +TEST_SCRIPTS ? ? ?= none Are these needed? You could write: CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = ...and get rid of *-none targets. > +install-facter: > + ? ? ? @ginstall -d $(DESTDIR) > + ? ? ? (cd $(WORKDIR)/$(DISTNAME); DESTDIR=$(DESTDIR) ruby install.rb) This one line would look cleaner: (cd $(WORKSRC); ./install.rb --destdir=$(DESTDIR)) (first ginstall isn't needed then) Maciej From hson at users.sourceforge.net Tue Mar 17 01:46:54 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 17 Mar 2009 00:46:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[3784] csw/mgar/pkg Message-ID: Revision: 3784 http://gar.svn.sourceforge.net/gar/?rev=3784&view=rev Author: hson Date: 2009-03-17 00:46:54 +0000 (Tue, 17 Mar 2009) Log Message: ----------- gnumeric: Initial commit Added Paths: ----------- csw/mgar/pkg/gnumeric/ csw/mgar/pkg/gnumeric/branches/ csw/mgar/pkg/gnumeric/tags/ csw/mgar/pkg/gnumeric/trunk/ csw/mgar/pkg/gnumeric/trunk/Makefile csw/mgar/pkg/gnumeric/trunk/checksums csw/mgar/pkg/gnumeric/trunk/files/ Property changes on: csw/mgar/pkg/gnumeric/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gnumeric/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnumeric/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnumeric/trunk/Makefile 2009-03-17 00:46:54 UTC (rev 3784) @@ -0,0 +1,24 @@ +GARNAME = gnumeric +GARVERSION = 1.8.3 +CATEGORIES = gnome + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring +REQUIRED_PKGS += CSWgnomevfs2 CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui +REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgnome CSWlibgnomecanvas +REQUIRED_PKGS += CSWlibgnomeui CSWlibgoffice CSWlibgsf CSWlibpopt CSWlibxml2 +REQUIRED_PKGS += CSWorbit2 CSWpango CSWperl CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/gnumeric/trunk/checksums =================================================================== --- csw/mgar/pkg/gnumeric/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnumeric/trunk/checksums 2009-03-17 00:46:54 UTC (rev 3784) @@ -0,0 +1 @@ +64721d3c0d48ffeb5bf721315682cdcd download/gnumeric-1.8.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Mar 17 02:05:21 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 17 Mar 2009 01:05:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3785] csw/mgar/pkg/gnutls/trunk/Makefile Message-ID: Revision: 3785 http://gar.svn.sourceforge.net/gar/?rev=3785&view=rev Author: harpchad Date: 2009-03-17 01:05:21 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Split development files to s seperate package Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-17 00:46:54 UTC (rev 3784) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-17 01:05:21 UTC (rev 3785) @@ -2,13 +2,19 @@ GARVERSION = 2.6.4 CATEGORIES = lib -DESCRIPTION = GNU Transport Layer Security lib and tools +DESCRIPTION = GNU Transport Layer Security libraries and tools define BLURB GnuTLS is a project that aims to develop a library which provides a secure layer, over a reliable transport layer. Currently the GnuTLS library implements the proposed standards by the IETF's TLS working group. endef +PACKAGES = CSWgnutls CSWgnutlsdevel +CATALOGNAME_CSWgnutls = gnutls +CATALOGNAME_CSWgnutlsdevel = gnutls_devel +SPKG_DESC_CSWgnutls = GNU Transport Layer Security libraries and tools +SPKG_DESC_CSWgnutlsdevel = GNU Transport Layer Security development headers and tools + MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += libgnutls-openssl.so.13.i @@ -35,6 +41,8 @@ REQUIRED_PKGS_CSWgnutls = CSWgcc4corert CSWgcc4g++rt CSWgcrypt CSWggettextrt REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib CSWiconv +PKGFILES_CSWgnutlsdevel = $(PKGFILES_DEVEL) + include gar/category.mk post-install-isa-sparcv8: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Mar 17 04:08:19 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 17 Mar 2009 03:08:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[3786] csw/mgar/pkg/gnutls/trunk/Makefile Message-ID: Revision: 3786 http://gar.svn.sourceforge.net/gar/?rev=3786&view=rev Author: harpchad Date: 2009-03-17 03:08:18 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Add CSWgnutls as requirement for CSWgnutlsdevel Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-17 01:05:21 UTC (rev 3785) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2009-03-17 03:08:18 UTC (rev 3786) @@ -40,6 +40,7 @@ REQUIRED_PKGS_CSWgnutls = CSWgcc4corert CSWgcc4g++rt CSWgcrypt CSWggettextrt REQUIRED_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib CSWiconv +REQUIRED_PKGS_CSWgnutlsdevel = CSWgnutls PKGFILES_CSWgnutlsdevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Mar 17 04:17:37 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 17 Mar 2009 03:17:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3787] csw/mgar/pkg/gcc4/trunk/files Message-ID: Revision: 3787 http://gar.svn.sourceforge.net/gar/?rev=3787&view=rev Author: valholla Date: 2009-03-17 03:17:37 +0000 (Tue, 17 Mar 2009) Log Message: ----------- checkin my changes to date Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/configure_def.mk csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/package_def.mk csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk Modified: csw/mgar/pkg/gcc4/trunk/files/configure_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/configure_def.mk 2009-03-17 03:08:18 UTC (rev 3786) +++ csw/mgar/pkg/gcc4/trunk/files/configure_def.mk 2009-03-17 03:17:37 UTC (rev 3787) @@ -1,23 +1,22 @@ -## Install everythong /opt/csw/gcc4 instead of /opt/csw -prefix = /opt/csw/gcc4 -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --exec-prefix=$(prefix) -CONFIGURE_ARGS += --enable-libada -CONFIGURE_ARGS += --enable-libssp -CONFIGURE_ARGS += --enable-objc-gc -CONFIGURE_ARGS += --enable-threads=posix -CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-mpfr=/opt/csw -CONFIGURE_ARGS += --with-gmp=/opt/csw +CONFIGURE_ARGS = --prefix=/opt/csw/gcc4 +CONFIGURE_ARGS += --exec-prefix=/opt/csw/gcc4 CONFIGURE_ARGS += --with-gnu-as CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas CONFIGURE_ARGS += --without-gnu-ld CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld -CONFIGURE_ARGS += --with-build-time-tools=/opt/csw/bin -## Do not try to build Ada -## Ada must be build with using GCC because the source uses some Ada Code -## Checkout gcc4ada* packages from svn if you wish to build Ada +CONFIGURE_ARGS += --enable-nls +CONFIGURE_ARGS += --with-included-gettext +CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw +CONFIGURE_ARGS += --with-x +CONFIGURE_ARGS += --with-mpfr=/opt/csw +CONFIGURE_ARGS += --with-gmp=/opt/csw +CONFIGURE_ARGS += --enable-java-awt=xlib +CONFIGURE_ARGS += --enable-libada +CONFIGURE_ARGS += --enable-libssp +CONFIGURE_ARGS += --enable-objc-gc +CONFIGURE_ARGS += --enable-threads=posix +CONFIGURE_ARGS += --enable-stage1-languages=c CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-17 03:08:18 UTC (rev 3786) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-17 03:17:37 UTC (rev 3787) @@ -1,26 +1,43 @@ +OBJECT_DIR = $(WORKDIR)/objdir +WORKSRC = $(OBJECT_DIR) +DIRPATHS = +OPTFLAGS = -WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL) -COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL) -INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL) -OBJECT_DIR = $(WORKDIR)/$(DISTNAME)/objdir -WORKSRC = $(OBJECT_DIR) -DIRPATHS = -OPTFLAGS = -CONFIG_SHELL = /opt/csw/bin/bash - - +CONFIG_SHELL = /bin/ksh +GARCOMPILER = SOS11 +SOS11_CC = /opt/studio/SOS11/SUNWspro/bin/cc -xO3 -xarch=v8 +CFLAGS = -I/opt/csw/include CPPFLAGS = -I/opt/csw/include -CFLAGS = -I/opt/csw/include CXXFLAGS = -I/opt/csw/include -LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\\\\\$\$ISALIST -R/opt/csw/lib -BOOT_CFLAGS = $(CFLAGS) -g -O2 -BOOT_LDFLAGS = $(LDFLAGS) +LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +BOOT_CFLAGS = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe +BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib -COMMON_EXPORTS += CONFIG_SHELL BOOT_CFLAGS BOOT_LDFLAGS +ifeq ($(shell uname -p),i386) +ifeq ($(shell uname -r),5.10) + GARCOMPILER = SOS12 + SOS12_CC = /opt/studio/SOS12/SUNWspro/bin/cc + CFLAGS = -I/opt/csw/include -m64 -xarch=sse2 + LDFLAGS = -L/opt/csw/lib/64 -R/opt/csw/lib + BOOT_CFLAGS = -I/opt/csw/include -m64 -march=opteron -g -O2 -pipe + BOOT_LDFLAGS = -L/opt/csw/lib/64 -R/opt/csw/lib/64 +else + GARCOMPILER = SOS11 + SOS11_CC = /opt/studio/SOS11/SUNWspro/bin/cc + CFLAGS = -I/opt/csw/include -xO3 -xarch=386 + LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib + BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe + BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +endif +endif +export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS +export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS + CONFIGURE_SCRIPTS = objdir TEST_SCRIPTS = skip +post-configure-modulated: fix-bootflags ## Run checkpkg Manually ENABLE_CHECK = 0 Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-03-17 03:08:18 UTC (rev 3786) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-03-17 03:17:37 UTC (rev 3787) @@ -1,121 +1,130 @@ ### Package Section ### PACKAGES = CSWgcc4core CSWgcc4corert CSWgcc4docs -PACKAGES += CSWgcc4g95 CSWgcc4g95rt CSWgcc4java CSWgcc4javart +PACKAGES += CSWgcc4gfortran CSWgcc4gfortranrt CSWgcc4java CSWgcc4javart PACKAGES += CSWgcc4objc CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt ## Define Package Catalog Names -CATALOGNAME_CSWgcc4core = gcc4core +CATALOGNAME_CSWgcc4core = gcc4core CATALOGNAME_CSWgcc4corert = gcc4corert -CATALOGNAME_CSWgcc4core = gcc4coredocs -CATALOGNAME_CSWgcc4g++ = gcc4g++ -CATALOGNAME_CSWgcc4g++rt = gcc4g++rt -CATALOGNAME_CSWgcc4g95 = gcc4g95 -CATALOGNAME_CSWgcc4g95rt = gcc4g95rt -CATALOGNAME_CSWgcc4java = gcc4java +CATALOGNAME_CSWgcc4core = gcc4coredocs +CATALOGNAME_CSWgcc4g++ = gcc4g++ +CATALOGNAME_CSWgcc4g++rt = gcc4g++rt +CATALOGNAME_CSWgcc4gfortran = gcc4gfortran +CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt +CATALOGNAME_CSWgcc4java = gcc4java CATALOGNAME_CSWgcc4javart = gcc4javart -CATALOGNAME_CSWgcc4objc = gcc4objc +CATALOGNAME_CSWgcc4objc = gcc4objc CATALOGNAME_CSWgcc4objcrt = gcc4obcrt ## Define Package Descriptions -SPKG_DESC_CSWgcc4core = GNU C Compiler -SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time +SPKG_DESC_CSWgcc4core = GNU C Compiler +SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time SPKG_DESC_CSWgcc4coredocs = GNU C Compiler Documtation and man pages -SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler -SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time -SPKG_DESC_CSWgcc4g95 = GNU Fortran Compiler -SPKG_DESC_CSWgcc4g95rt = GNU Fortran Compiler Run Time -SPKG_DESC_CSWgcc4java = GNU Java Compiler -SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time -SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler -SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time +SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler +SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time +SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler +SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time +SPKG_DESC_CSWgcc4java = GNU Java Compiler +SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time +SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler +SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time ## Define Dependencies REQUIRED_PKGS_CSWgcc4corert = CSWggettextrt CSWiconv CSWlibgmp CSWlibmpfr -REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert -REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4core -REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4g++rt -REQUIRED_PKGS_CSWgcc4g95rt = CSWgcc4core -REQUIRED_PKGS_CSWgcc4g95 = CSWgcc4g95rt +REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert +REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4core +REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4g++rt +REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4core +REQUIRED_PKGS_CSWgcc4gfortran95 = CSWgcc4gfortranrt REQUIRED_PKGS_CSWgcc4javart = CSWgcc4core -REQUIRED_PKGS_CSWgcc4java = CSWgcc4javart +REQUIRED_PKGS_CSWgcc4java = CSWgcc4javart REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4core -REQUIRED_PKGS_CSWgcc4objc = CSWgcc4objcrt +REQUIRED_PKGS_CSWgcc4objc = CSWgcc4objcrt +PKG_DIR = /opt/csw/gcc4 ## Define the Contents of the Packages ## GNU Compiler Suite Docs -PKGFILES_CSWgcc4docs = $(datadir)/doc/.* -PKGFILES_CSWgcc4docs += $(mandir)/.* -PKGFILES_CSWgcc4docs += $(infodir)/.* +PKGFILES_CSWgcc4docs += $(PKG_DIR)/man/.* +PKGFILES_CSWgcc4docs += $(PKG_DIR)/info/.* ## gcc4objc Definitions -PKGFILES_CSWgcc4objc = $(libexecdir)/.*/cc1obj -PKGFILES_CSWgcc4objc += $(libdir)/.*/objc/.* -PKGFILES_CSWgcc4objc += $(libdir)/.*/gcj/libgcj.* +PKGFILES_CSWgcc4objc = /opt/csw/share/doc/gcc4objc/license +PKGFILES_CSWgcc4objc += $(PKG_DIR)/libexec/.*/cc1obj +PKGFILES_CSWgcc4objc += $(PKG_DIR)/lib/.*/objc/.* +PKGFILES_CSWgcc4objc += $(PKG_DIR)/lib/.*/gcj/libgcj.* ## gcc4objc Runtime -PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.* +PKGFILES_CSWgcc4objcrt = /opt/csw/share/doc/gcc4objcrt/license +PKGFILES_CSWgcc4objcrt += $(PKG_DIR)/lib/.*libobjc.* ## gcc4java Definitions -PKGFILES_CSWgcc4java = $(datadir)/java.* -PKGFILES_CSWgcc4java += $(libexecdir)/.*/jvgenmain -PKGFILES_CSWgcc4java += $(libexecdir)/.*/jc1 -PKGFILES_CSWgcc4java += $(libdir)/pkgconfig/libgcj.pc -PKGFILES_CSWgcc4java += $(includedir)/.*/ffi.h -PKGFILES_CSWgcc4java += $(includedir)/.*/org/.* -PKGFILES_CSWgcc4java += $(includedir)/.*/java.*/.* -PKGFILES_CSWgcc4java += $(includedir)/.*/gcj/.* -PKGFILES_CSWgcc4java += $(includedir)/.*/classpath/.* -PKGFILES_CSWgcc4java += $(includedir)/.*/awt/.* -PKGFILES_CSWgcc4java += $(includedir)/.*/gnu/.* -PKGFILES_CSWgcc4java += $(bindir)/.*gcj.* -PKGFILES_CSWgcc4java += $(bindir)/jv-scan -PKGFILES_CSWgcc4java += $(bindir)/jv-convert -PKGFILES_CSWgcc4java += $(bindir)/jcf-dump -PKGFILES_CSWgcc4java += $(bindir)/grmi.* -PKGFILES_CSWgcc4java += $(bindir)/grepjar -PKGFILES_CSWgcc4java += $(bindir)/gjnih -PKGFILES_CSWgcc4java += $(bindir)/gij -PKGFILES_CSWgcc4java += $(bindir)/fastjar -PKGFILES_CSWgcc4java += $(bindir)/gjar.* -PKGFILES_CSWgcc4java += $(bindir)/gjavah -PKGFILES_CSWgcc4java += $(bindir)/gorbd -PKGFILES_CSWgcc4java += $(bindir)/addr2name.awk -PKGFILES_CSWgcc4java += $(bindir)/gappletviewer -PKGFILES_CSWgcc4java += $(bindir)/gkeytool -PKGFILES_CSWgcc4java += $(bindir)/gserialver -PKGFILES_CSWgcc4java += $(bindir)/gtnameserv -PKGFILES_CSWgcc4java += $(bindir)/gnative2ascii -PKGFILES_CSWgcc4java += $(bindir)/gc-analyze +PKGFILES_CSWgcc4java = /opt/csw/share/doc/gcc4java/license +PKGFILES_CSWgcc4java += $(PKG_DIR)/share/java.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/libexec/.*/jvgenmain +PKGFILES_CSWgcc4java += $(PKG_DIR)/libexec/.*/jc1 +PKGFILES_CSWgcc4java += $(PKG_DIR)/lib/pkgconfig/libgcj.pc +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/ffi.h +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/org/.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/java.*/.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/gcj/.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/classpath/.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/awt/.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/include/.*/gnu/.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/.*gcj.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/jv-scan +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/jv-convert +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/jcf-dump +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/grmi.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/grepjar +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gjnih +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gij +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/fastjar +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gjar.* +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gjavah +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gorbd +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/addr2name.awk +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gappletviewer +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gkeytool +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gserialver +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gtnameserv +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gnative2ascii +PKGFILES_CSWgcc4java += $(PKG_DIR)/bin/gc-analyze ## gcc4java RunTime -PKGFILES_CSWgcc4javart = $(datadir)/java/.* -PKGFILES_CSWgcc4javart += $(libdir)/.*libgij.* -PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.* -PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.* -PKGFILES_CSWgcc4javart += $(libdir)/security/libgcj.* -PKGFILES_CSWgcc4javart += $(libdir)/security/classpath.* -PKGFILES_CSWgcc4javart += $(libdir)/logging.properties -PKGFILES_CSWgcc4javart += $(libdir)/gcj.*/classmap.db +PKGFILES_CSWgcc4javart = /opt/csw/share/doc/gcc4javart/license +PKGFILES_CSWgcc4javart += $(PKG_DIR)/share/java/.* +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/.*libgij.* +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/.*libffi.* +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/.*lib-gnu-awt.* +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/security/libgcj.* +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/security/classpath.* +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/logging.properties +PKGFILES_CSWgcc4javart += $(PKG_DIR)/lib/gcj.*/classmap.db -## gcc4g95 Definitions -PKGFILES_CSWgcc4g95 = $(libexecdir)/.*/f951 -PKGFILES_CSWgcc4g95 += $(bindir)/.*gfortran -## gcc4g95 RunTime -PKGFILES_CSWgcc4g95rt = $(libdir)/.*libgfortran.* +## gcc4gfortran Definitions +PKGFILES_CSWgcc4gfortran = /opt/csw/share/doc/gcc4gfortran/license +PKGFILES_CSWgcc4gfortran += $(PKG_DIR)/lib/.*/f951 +PKGFILES_CSWgcc4gfortran += $(PKG_DIR)/lib/.*gfortran +## gcc4gfortran RunTime +PKGFILES_CSWgcc4gfortranrt = /opt/csw/share/doc/gcc4gfortranrt/license +PKGFILES_CSWgcc4gfortranrt = $(PKG_DIR)/lib/.*libgfortran.* ## gcc4g++ Definitions -PKGFILES_CSWgcc4g++ = $(libexecdir)/.*/cc1plus -PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/.* -PKGFILES_CSWgcc4g++ += $(bindir)/.*g\+\+ -PKGFILES_CSWgcc4g++ += $(bindir)/.*c\+\+ -EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(includedir)/.*/org/.* -EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(includedir)/.*/java.*/.* -EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(includedir)/.*/gcj/.* -EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(includedir)/.*/classpath/.* -EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(includedir)/.*/awt/.* -EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(includedir)/.*/gnu/.* +PKGFILES_CSWgcc4g++ = /opt/csw/share/doc/gcc4g++/license +PKGFILES_CSWgcc4g++ += $(PKG_DIR)/libexec/.*/cc1plus +PKGFILES_CSWgcc4g++ += $(PKG_DIR)/include/c++/.* +PKGFILES_CSWgcc4g++ += $(PKG_DIR)/bin/.*g++ +PKGFILES_CSWgcc4g++ += $(PKG_DIR)/bin/.*c++ +EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(PKG_DIR)/include/.*/org/.* +EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(PKG_DIR)/include/.*/java.*/.* +EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(PKG_DIR)/include/.*/gcj/.* +EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(PKG_DIR)/include/.*/classpath/.* +EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(PKG_DIR)/include/.*/awt/.* +EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += $(PKG_DIR)/include/.*/gnu/.* ## gcc4g++ RunTime -PKGFILES_CSWgcc4g++rt = $(libdir)/.*libstdc.* +PKGFILES_CSWgcc4g++rt = /opt/csw/share/doc/gcc4g++rt/license +PKGFILES_CSWgcc4g++rt += $(PKG_DIR)/lib/.*libstdc.* ## gcc4core RunTime -PKGFILES_CSWgcc4corert = $(libdir)/.*libgcc_s.* +PKGFILES_CSWgcc4corert = /opt/csw/share/doc/gcc4corert/license +PKGFILES_CSWgcc4corert = $(PKG_DIR)/lib/.*libgcc_s.* Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-17 03:08:18 UTC (rev 3786) +++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-17 03:17:37 UTC (rev 3787) @@ -1,4 +1,5 @@ + ## Create $(OBJECT_DIR) to build in post-extract-$(addprefix post-extract-,$(MODULATIONS)): echo "==> Creating Object Dir for Building" @@ -9,9 +10,18 @@ ## Run it from the $(OBJECT_DIR) configure-objdir: echo "==> Running Configure from $(OBJECT_DIR)" - cd $(OBJECT_DIR) && $(CONFIGURE_ENV) ../configure $(CONFIGURE_ARGS) + cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \ + ../$(DISTNAME)/configure $(CONFIGURE_ARGS) $(DONADA) +## Set the CFLAGS so the correct architecture is used +fix-bootflags: + @(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \ + $(WORKSRC)/Makefile) + @(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \ + $(WORKSRC)/Makefile) + @$(DONADA) + test-skip: - $(DONADA) + @$(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Mar 17 04:32:05 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 17 Mar 2009 03:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3788] csw/mgar/pkg/gnumeric/trunk Message-ID: Revision: 3788 http://gar.svn.sourceforge.net/gar/?rev=3788&view=rev Author: hson Date: 2009-03-17 03:32:05 +0000 (Tue, 17 Mar 2009) Log Message: ----------- gnumeric: Initial commit Modified Paths: -------------- csw/mgar/pkg/gnumeric/trunk/Makefile csw/mgar/pkg/gnumeric/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnumeric/trunk/files/mainpatch Modified: csw/mgar/pkg/gnumeric/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnumeric/trunk/Makefile 2009-03-17 03:17:37 UTC (rev 3787) +++ csw/mgar/pkg/gnumeric/trunk/Makefile 2009-03-17 03:32:05 UTC (rev 3788) @@ -19,6 +19,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES = mainpatch + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/gnumeric/trunk/checksums =================================================================== --- csw/mgar/pkg/gnumeric/trunk/checksums 2009-03-17 03:17:37 UTC (rev 3787) +++ csw/mgar/pkg/gnumeric/trunk/checksums 2009-03-17 03:32:05 UTC (rev 3788) @@ -1 +1,2 @@ 64721d3c0d48ffeb5bf721315682cdcd download/gnumeric-1.8.3.tar.gz +cf9ffd8f1b23eec556cd949af385b972 download/mainpatch Added: csw/mgar/pkg/gnumeric/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/gnumeric/trunk/files/mainpatch (rev 0) +++ csw/mgar/pkg/gnumeric/trunk/files/mainpatch 2009-03-17 03:32:05 UTC (rev 3788) @@ -0,0 +1,730 @@ +Only in gnumeric-1.8.3: Makefile +Only in gnumeric-1.8.3: config.log +Only in gnumeric-1.8.3: config.status +Only in gnumeric-1.8.3: config.status.lineno +Only in gnumeric-1.8.3/doc/C: Makefile +Only in gnumeric-1.8.3/doc/C/figures: Makefile +Only in gnumeric-1.8.3/doc/C/figures/icons: Makefile +Only in gnumeric-1.8.3/doc/C: gnumeric-C.omf.out +Only in gnumeric-1.8.3/doc/C: omf_timestamp +Only in gnumeric-1.8.3/doc: Makefile +Only in gnumeric-1.8.3/doc/developer: Makefile +Only in gnumeric-1.8.3: gnumeric-config.h +Only in gnumeric-1.8.3: gnumeric-features.h +Only in gnumeric-1.8.3: gnumeric.desktop +Only in gnumeric-1.8.3/icons: Makefile +Only in gnumeric-1.8.3: intltool-extract +Only in gnumeric-1.8.3: intltool-merge +Only in gnumeric-1.8.3: intltool-update +Only in gnumeric-1.8.3: libspreadsheet-1.8.pc +Only in gnumeric-1.8.3: libspreadsheet.pc +Only in gnumeric-1.8.3: libtool +Only in gnumeric-1.8.3/plugins: Makefile +Only in gnumeric-1.8.3/plugins/applix: .deps +Only in gnumeric-1.8.3/plugins/applix: .libs +Only in gnumeric-1.8.3/plugins/applix: Makefile +Only in gnumeric-1.8.3/plugins/applix: applix-read.lo +Only in gnumeric-1.8.3/plugins/applix: applix-write.lo +Only in gnumeric-1.8.3/plugins/applix: applix.la +Only in gnumeric-1.8.3/plugins/applix: boot.lo +Only in gnumeric-1.8.3/plugins/applix: plugin.xml +Only in gnumeric-1.8.3/plugins/corba: .deps +Only in gnumeric-1.8.3/plugins/corba: .libs +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-common.c +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-common.lo +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-skels.c +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-skels.lo +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-stubs.c +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-stubs.lo +Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric.h +Only in gnumeric-1.8.3/plugins/corba: Makefile +Only in gnumeric-1.8.3/plugins/corba: corba-application.lo +Only in gnumeric-1.8.3/plugins/corba: corba-sheet.lo +Only in gnumeric-1.8.3/plugins/corba: corba-workbook.lo +Only in gnumeric-1.8.3/plugins/corba: corba.la +Only in gnumeric-1.8.3/plugins/corba: plugin.xml +Only in gnumeric-1.8.3/plugins/corba: stamp_Gnumeric_idl +Only in gnumeric-1.8.3/plugins/derivatives: .deps +Only in gnumeric-1.8.3/plugins/derivatives: .libs +Only in gnumeric-1.8.3/plugins/derivatives: Makefile +Only in gnumeric-1.8.3/plugins/derivatives: derivatives.la +Only in gnumeric-1.8.3/plugins/derivatives: options.lo +Only in gnumeric-1.8.3/plugins/derivatives: plugin.xml +Only in gnumeric-1.8.3/plugins/dif: .deps +Only in gnumeric-1.8.3/plugins/dif: .libs +Only in gnumeric-1.8.3/plugins/dif: Makefile +Only in gnumeric-1.8.3/plugins/dif: dif.la +Only in gnumeric-1.8.3/plugins/dif: dif.lo +Only in gnumeric-1.8.3/plugins/dif: plugin.xml +Only in gnumeric-1.8.3/plugins/excel: .deps +Only in gnumeric-1.8.3/plugins/excel: .libs +Only in gnumeric-1.8.3/plugins/excel: Makefile +Only in gnumeric-1.8.3/plugins/excel: boot.lo +Only in gnumeric-1.8.3/plugins/excel: crypt-md4.lo +Only in gnumeric-1.8.3/plugins/excel: excel-xml-read.lo +Only in gnumeric-1.8.3/plugins/excel: excel.la +diff -ru gnumeric-1.8.3.orig/plugins/excel/md5.h gnumeric-1.8.3/plugins/excel/md5.h +--- gnumeric-1.8.3.orig/plugins/excel/md5.h 2008-01-15 00:55:11.000000000 +0100 ++++ gnumeric-1.8.3/plugins/excel/md5.h 2009-03-17 00:23:02.110582251 +0100 +@@ -22,7 +22,11 @@ + #define _MD5_H 1 + + #include ++#ifdef __sun ++#include ++#else + #include ++#endif + + #define MD5_DIGEST_SIZE 16 + #define MD5_BLOCK_SIZE 64 +Only in gnumeric-1.8.3/plugins/excel: md5.lo +Only in gnumeric-1.8.3/plugins/excel: ms-biff.lo +Only in gnumeric-1.8.3/plugins/excel: ms-chart.lo +Only in gnumeric-1.8.3/plugins/excel: ms-container.lo +Only in gnumeric-1.8.3/plugins/excel: ms-escher.lo +Only in gnumeric-1.8.3/plugins/excel: ms-excel-read.lo +Only in gnumeric-1.8.3/plugins/excel: ms-excel-util.lo +Only in gnumeric-1.8.3/plugins/excel: ms-excel-write.lo +Only in gnumeric-1.8.3/plugins/excel: ms-formula-read.lo +Only in gnumeric-1.8.3/plugins/excel: ms-formula-write.lo +Only in gnumeric-1.8.3/plugins/excel: ms-obj.lo +Only in gnumeric-1.8.3/plugins/excel: ms-pivot.lo +Only in gnumeric-1.8.3/plugins/excel: plugin.xml +Only in gnumeric-1.8.3/plugins/excel: rc4.lo +Only in gnumeric-1.8.3/plugins/excel: xlsx-read.lo +Only in gnumeric-1.8.3/plugins/excel: xlsx-utils.lo +Only in gnumeric-1.8.3/plugins/excel: xlsx-write.lo +Only in gnumeric-1.8.3/plugins/fn-complex: .deps +Only in gnumeric-1.8.3/plugins/fn-complex: .libs +Only in gnumeric-1.8.3/plugins/fn-complex: Makefile +Only in gnumeric-1.8.3/plugins/fn-complex: functions.lo +Only in gnumeric-1.8.3/plugins/fn-complex: gsl-complex.lo +Only in gnumeric-1.8.3/plugins/fn-complex: plugin.la +Only in gnumeric-1.8.3/plugins/fn-complex: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-database: .deps +Only in gnumeric-1.8.3/plugins/fn-database: .libs +Only in gnumeric-1.8.3/plugins/fn-database: Makefile +Only in gnumeric-1.8.3/plugins/fn-database: functions.lo +Only in gnumeric-1.8.3/plugins/fn-database: plugin.la +Only in gnumeric-1.8.3/plugins/fn-database: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-date: .deps +Only in gnumeric-1.8.3/plugins/fn-date: .libs +Only in gnumeric-1.8.3/plugins/fn-date: Makefile +Only in gnumeric-1.8.3/plugins/fn-date: functions.lo +Only in gnumeric-1.8.3/plugins/fn-date: plugin.la +Only in gnumeric-1.8.3/plugins/fn-date: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-eng: .deps +Only in gnumeric-1.8.3/plugins/fn-eng: .libs +Only in gnumeric-1.8.3/plugins/fn-eng: Makefile +Only in gnumeric-1.8.3/plugins/fn-eng: functions.lo +Only in gnumeric-1.8.3/plugins/fn-eng: plugin.la +Only in gnumeric-1.8.3/plugins/fn-eng: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-erlang: .deps +Only in gnumeric-1.8.3/plugins/fn-erlang: .libs +Only in gnumeric-1.8.3/plugins/fn-erlang: Makefile +Only in gnumeric-1.8.3/plugins/fn-erlang: erlang.la +Only in gnumeric-1.8.3/plugins/fn-erlang: functions.lo +Only in gnumeric-1.8.3/plugins/fn-erlang: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-financial: .deps +Only in gnumeric-1.8.3/plugins/fn-financial: .libs +Only in gnumeric-1.8.3/plugins/fn-financial: Makefile +Only in gnumeric-1.8.3/plugins/fn-financial: functions.lo +Only in gnumeric-1.8.3/plugins/fn-financial: plugin.la +Only in gnumeric-1.8.3/plugins/fn-financial: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-financial: sc-fin.lo +Only in gnumeric-1.8.3/plugins/fn-info: .deps +Only in gnumeric-1.8.3/plugins/fn-info: .libs +Only in gnumeric-1.8.3/plugins/fn-info: Makefile +Only in gnumeric-1.8.3/plugins/fn-info: functions.lo +Only in gnumeric-1.8.3/plugins/fn-info: plugin.la +Only in gnumeric-1.8.3/plugins/fn-info: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-logical: .deps +Only in gnumeric-1.8.3/plugins/fn-logical: .libs +Only in gnumeric-1.8.3/plugins/fn-logical: Makefile +Only in gnumeric-1.8.3/plugins/fn-logical: functions.lo +Only in gnumeric-1.8.3/plugins/fn-logical: plugin.la +Only in gnumeric-1.8.3/plugins/fn-logical: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-lookup: .deps +Only in gnumeric-1.8.3/plugins/fn-lookup: .libs +Only in gnumeric-1.8.3/plugins/fn-lookup: Makefile +Only in gnumeric-1.8.3/plugins/fn-lookup: functions.lo +Only in gnumeric-1.8.3/plugins/fn-lookup: plugin.la +Only in gnumeric-1.8.3/plugins/fn-lookup: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-math: .deps +Only in gnumeric-1.8.3/plugins/fn-math: .libs +Only in gnumeric-1.8.3/plugins/fn-math: Makefile +Only in gnumeric-1.8.3/plugins/fn-math: functions.lo +Only in gnumeric-1.8.3/plugins/fn-math: plugin.la +Only in gnumeric-1.8.3/plugins/fn-math: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-r: .deps +Only in gnumeric-1.8.3/plugins/fn-r: .libs +Only in gnumeric-1.8.3/plugins/fn-r: Makefile +Only in gnumeric-1.8.3/plugins/fn-r: extra.lo +Only in gnumeric-1.8.3/plugins/fn-r: functions.lo +Only in gnumeric-1.8.3/plugins/fn-r: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-r: rstat.la +Only in gnumeric-1.8.3/plugins/fn-random: .deps +Only in gnumeric-1.8.3/plugins/fn-random: .libs +Only in gnumeric-1.8.3/plugins/fn-random: Makefile +Only in gnumeric-1.8.3/plugins/fn-random: functions.lo +Only in gnumeric-1.8.3/plugins/fn-random: plugin.la +Only in gnumeric-1.8.3/plugins/fn-random: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-stat: .deps +Only in gnumeric-1.8.3/plugins/fn-stat: .libs +Only in gnumeric-1.8.3/plugins/fn-stat: Makefile +Only in gnumeric-1.8.3/plugins/fn-stat: functions.lo +Only in gnumeric-1.8.3/plugins/fn-stat: plugin.la +Only in gnumeric-1.8.3/plugins/fn-stat: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-string: .deps +Only in gnumeric-1.8.3/plugins/fn-string: .libs +Only in gnumeric-1.8.3/plugins/fn-string: Makefile +Only in gnumeric-1.8.3/plugins/fn-string: functions.lo +Only in gnumeric-1.8.3/plugins/fn-string: plugin.la +Only in gnumeric-1.8.3/plugins/fn-string: plugin.xml +Only in gnumeric-1.8.3/plugins/fn-tsa: .deps +Only in gnumeric-1.8.3/plugins/fn-tsa: .libs +Only in gnumeric-1.8.3/plugins/fn-tsa: Makefile +Only in gnumeric-1.8.3/plugins/fn-tsa: functions.lo +Only in gnumeric-1.8.3/plugins/fn-tsa: plugin.la +Only in gnumeric-1.8.3/plugins/fn-tsa: plugin.xml +Only in gnumeric-1.8.3/plugins/gda: .deps +Only in gnumeric-1.8.3/plugins/gda: Makefile +Only in gnumeric-1.8.3/plugins/gnome-db: .deps +Only in gnumeric-1.8.3/plugins/gnome-db: Makefile +Only in gnumeric-1.8.3/plugins/gnome-glossary: Makefile +Only in gnumeric-1.8.3/plugins/html: .deps +Only in gnumeric-1.8.3/plugins/html: .libs +Only in gnumeric-1.8.3/plugins/html: Makefile +Only in gnumeric-1.8.3/plugins/html: boot.lo +Only in gnumeric-1.8.3/plugins/html: font.lo +Only in gnumeric-1.8.3/plugins/html: html.la +Only in gnumeric-1.8.3/plugins/html: html.lo +Only in gnumeric-1.8.3/plugins/html: html_read.lo +Only in gnumeric-1.8.3/plugins/html: latex.lo +Only in gnumeric-1.8.3/plugins/html: plugin.xml +Only in gnumeric-1.8.3/plugins/html: roff.lo +Only in gnumeric-1.8.3/plugins/lotus-123: .deps +Only in gnumeric-1.8.3/plugins/lotus-123: .libs +Only in gnumeric-1.8.3/plugins/lotus-123: Makefile +Only in gnumeric-1.8.3/plugins/lotus-123: boot.lo +Only in gnumeric-1.8.3/plugins/lotus-123: lotus-formula.lo +Only in gnumeric-1.8.3/plugins/lotus-123: lotus.la +Only in gnumeric-1.8.3/plugins/lotus-123: lotus.lo +Only in gnumeric-1.8.3/plugins/lotus-123: plugin.xml +Only in gnumeric-1.8.3/plugins/mps: .deps +Only in gnumeric-1.8.3/plugins/mps: .libs +Only in gnumeric-1.8.3/plugins/mps: Makefile +Only in gnumeric-1.8.3/plugins/mps: mps.la +Only in gnumeric-1.8.3/plugins/mps: mps.lo +Only in gnumeric-1.8.3/plugins/mps: parser.lo +Only in gnumeric-1.8.3/plugins/mps: plugin.xml +Only in gnumeric-1.8.3/plugins/numtheory: .deps +Only in gnumeric-1.8.3/plugins/numtheory: .libs +Only in gnumeric-1.8.3/plugins/numtheory: Makefile +diff -ru gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c gnumeric-1.8.3/plugins/numtheory/numtheory.c +--- gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c 2008-01-15 00:55:10.000000000 +0100 ++++ gnumeric-1.8.3/plugins/numtheory/numtheory.c 2009-03-17 00:55:21.253509921 +0100 +@@ -33,7 +33,14 @@ + + #define OUT_OF_BOUNDS "#LIMIT!" + ++#ifdef __sun ++static inline double bit_max_fn(void) { ++ return MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64); ++} ++#define bit_max (bit_max_fn()) ++#else + static const double bit_max = MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64); ++#endif + + /* ------------------------------------------------------------------------- */ + +Only in gnumeric-1.8.3/plugins/numtheory: numtheory.e +Only in gnumeric-1.8.3/plugins/numtheory: numtheory.la +Only in gnumeric-1.8.3/plugins/numtheory: numtheory.lo +Only in gnumeric-1.8.3/plugins/numtheory: plugin.xml +Only in gnumeric-1.8.3/plugins/oleo: .deps +Only in gnumeric-1.8.3/plugins/oleo: .libs +Only in gnumeric-1.8.3/plugins/oleo: Makefile +Only in gnumeric-1.8.3/plugins/oleo: boot.lo +Only in gnumeric-1.8.3/plugins/oleo: oleo.la +Only in gnumeric-1.8.3/plugins/oleo: oleo.lo +Only in gnumeric-1.8.3/plugins/oleo: plugin.xml +Only in gnumeric-1.8.3/plugins/openoffice: .deps +Only in gnumeric-1.8.3/plugins/openoffice: .libs +Only in gnumeric-1.8.3/plugins/openoffice: Makefile +Only in gnumeric-1.8.3/plugins/openoffice: openoffice-read.lo +Only in gnumeric-1.8.3/plugins/openoffice: openoffice-write.lo +Only in gnumeric-1.8.3/plugins/openoffice: openoffice.la +Only in gnumeric-1.8.3/plugins/openoffice: plugin.xml +Only in gnumeric-1.8.3/plugins/paradox: .deps +Only in gnumeric-1.8.3/plugins/paradox: Makefile +Only in gnumeric-1.8.3/plugins/perl-func: Makefile +Only in gnumeric-1.8.3/plugins/perl-func: plugin.xml +Only in gnumeric-1.8.3/plugins/perl-loader: .libs +Only in gnumeric-1.8.3/plugins/perl-loader: Makefile +Only in gnumeric-1.8.3/plugins/perl-loader: boot.lo +Only in gnumeric-1.8.3/plugins/perl-loader: perl-gnumeric.lo +Only in gnumeric-1.8.3/plugins/perl-loader: perl-loader.lo +Only in gnumeric-1.8.3/plugins/perl-loader: perl_loader.la +Only in gnumeric-1.8.3/plugins/perl-loader: plugin.xml +Only in gnumeric-1.8.3/plugins/perl-loader: xsinit.c +Only in gnumeric-1.8.3/plugins/perl-loader: xsinit.lo +Only in gnumeric-1.8.3/plugins/plan-perfect: .deps +Only in gnumeric-1.8.3/plugins/plan-perfect: .libs +Only in gnumeric-1.8.3/plugins/plan-perfect: Makefile +Only in gnumeric-1.8.3/plugins/plan-perfect: charset.lo +Only in gnumeric-1.8.3/plugins/plan-perfect: plan_perfect.la +Only in gnumeric-1.8.3/plugins/plan-perfect: pln.lo +Only in gnumeric-1.8.3/plugins/plan-perfect: plugin.xml +Only in gnumeric-1.8.3/plugins/psiconv: .deps +Only in gnumeric-1.8.3/plugins/psiconv: Makefile +Only in gnumeric-1.8.3/plugins/py-func: Makefile +Only in gnumeric-1.8.3/plugins/python-loader: .deps +Only in gnumeric-1.8.3/plugins/python-loader: Makefile +Only in gnumeric-1.8.3/plugins/qpro: .deps +Only in gnumeric-1.8.3/plugins/qpro: .libs +Only in gnumeric-1.8.3/plugins/qpro: Makefile +Only in gnumeric-1.8.3/plugins/qpro: plugin.xml +Only in gnumeric-1.8.3/plugins/qpro: qpro-read.lo +Only in gnumeric-1.8.3/plugins/qpro: qpro.la +Only in gnumeric-1.8.3/plugins/sample_datasource: .deps +Only in gnumeric-1.8.3/plugins/sample_datasource: .libs +Only in gnumeric-1.8.3/plugins/sample_datasource: Makefile +Only in gnumeric-1.8.3/plugins/sample_datasource: plugin.xml +Only in gnumeric-1.8.3/plugins/sample_datasource: sample_datasource.la +Only in gnumeric-1.8.3/plugins/sample_datasource: sample_datasource.lo +Only in gnumeric-1.8.3/plugins/sc: .deps +Only in gnumeric-1.8.3/plugins/sc: .libs +Only in gnumeric-1.8.3/plugins/sc: Makefile +Only in gnumeric-1.8.3/plugins/sc: plugin.xml +Only in gnumeric-1.8.3/plugins/sc: sc.la +Only in gnumeric-1.8.3/plugins/sc: sc.lo +Only in gnumeric-1.8.3/plugins/sylk: .deps +Only in gnumeric-1.8.3/plugins/sylk: .libs +Only in gnumeric-1.8.3/plugins/sylk: Makefile +Only in gnumeric-1.8.3/plugins/sylk: plugin.xml +Only in gnumeric-1.8.3/plugins/sylk: sylk-write.lo +Only in gnumeric-1.8.3/plugins/sylk: sylk.la +Only in gnumeric-1.8.3/plugins/sylk: sylk.lo +Only in gnumeric-1.8.3/plugins/uihello: .deps +Only in gnumeric-1.8.3/plugins/uihello: .libs +Only in gnumeric-1.8.3/plugins/uihello: Makefile +Only in gnumeric-1.8.3/plugins/uihello: plugin.la +Only in gnumeric-1.8.3/plugins/uihello: plugin.xml +Only in gnumeric-1.8.3/plugins/uihello: uihello.lo +Only in gnumeric-1.8.3/plugins/xbase: .deps +Only in gnumeric-1.8.3/plugins/xbase: .libs +Only in gnumeric-1.8.3/plugins/xbase: Makefile +Only in gnumeric-1.8.3/plugins/xbase: boot.lo +Only in gnumeric-1.8.3/plugins/xbase: plugin.xml +Only in gnumeric-1.8.3/plugins/xbase: xbase.la +Only in gnumeric-1.8.3/plugins/xbase: xbase.lo +Only in gnumeric-1.8.3/po: .intltool-merge-cache +Only in gnumeric-1.8.3/po: Makefile +Only in gnumeric-1.8.3/po: Makefile.in +diff -ru gnumeric-1.8.3.orig/po/Makefile.in.in gnumeric-1.8.3/po/Makefile.in.in +--- gnumeric-1.8.3.orig/po/Makefile.in.in 2008-05-24 22:40:36.000000000 +0200 ++++ gnumeric-1.8.3/po/Makefile.in.in 2009-03-17 00:59:24.557217225 +0100 +@@ -69,7 +69,7 @@ + EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS + + POTFILES = \ +- ++# + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + +Only in gnumeric-1.8.3/po: POTFILES +Only in gnumeric-1.8.3/po: am.gmo +Only in gnumeric-1.8.3/po: ar.gmo +Only in gnumeric-1.8.3/po: az.gmo +Only in gnumeric-1.8.3/po: bg.gmo +Only in gnumeric-1.8.3/po: ca.gmo +Only in gnumeric-1.8.3/po: cs.gmo +Only in gnumeric-1.8.3/po: da.gmo +Only in gnumeric-1.8.3/po: de.gmo +Only in gnumeric-1.8.3/po: dz.gmo +Only in gnumeric-1.8.3/po: el.gmo +Only in gnumeric-1.8.3/po: en_CA.gmo +Only in gnumeric-1.8.3/po: en_GB.gmo +Only in gnumeric-1.8.3/po: es.gmo +Only in gnumeric-1.8.3/po: et.gmo +Only in gnumeric-1.8.3/po: fi.gmo +Only in gnumeric-1.8.3/po: fr.gmo +Only in gnumeric-1.8.3/po: ga.gmo +Only in gnumeric-1.8.3/po: gl.gmo +Only in gnumeric-1.8.3/po: he.gmo +Only in gnumeric-1.8.3/po: hr.gmo +Only in gnumeric-1.8.3/po: hu.gmo +Only in gnumeric-1.8.3/po: it.gmo +Only in gnumeric-1.8.3/po: ja.gmo +Only in gnumeric-1.8.3/po: ko.gmo +Only in gnumeric-1.8.3/po: lt.gmo +Only in gnumeric-1.8.3/po: lv.gmo +Only in gnumeric-1.8.3/po: mk.gmo +Only in gnumeric-1.8.3/po: ml.gmo +Only in gnumeric-1.8.3/po: mr.gmo +Only in gnumeric-1.8.3/po: ms.gmo +Only in gnumeric-1.8.3/po: nb.gmo +Only in gnumeric-1.8.3/po: ne.gmo +Only in gnumeric-1.8.3/po: nl.gmo +Only in gnumeric-1.8.3/po: nn.gmo +Only in gnumeric-1.8.3/po: oc.gmo +Only in gnumeric-1.8.3/po: pl.gmo +Only in gnumeric-1.8.3/po: pt.gmo +Only in gnumeric-1.8.3/po: pt_BR.gmo +Only in gnumeric-1.8.3/po: ro.gmo +Only in gnumeric-1.8.3/po: ru.gmo +Only in gnumeric-1.8.3/po: rw.gmo +Only in gnumeric-1.8.3/po: sk.gmo +Only in gnumeric-1.8.3/po: sr.gmo +Only in gnumeric-1.8.3/po: sr at Latn.gmo +Only in gnumeric-1.8.3/po: stamp-it +Only in gnumeric-1.8.3/po: sv.gmo +Only in gnumeric-1.8.3/po: te.gmo +Only in gnumeric-1.8.3/po: tr.gmo +Only in gnumeric-1.8.3/po: uk.gmo +Only in gnumeric-1.8.3/po: vi.gmo +Only in gnumeric-1.8.3/po: zh_CN.gmo +Only in gnumeric-1.8.3/po: zh_TW.gmo +Only in gnumeric-1.8.3/po-functions: Makefile +Only in gnumeric-1.8.3/po-functions: Makefile.in +Only in gnumeric-1.8.3/po-functions: POTFILES +Only in gnumeric-1.8.3/po-functions: am.gmo +Only in gnumeric-1.8.3/po-functions: ar.gmo +Only in gnumeric-1.8.3/po-functions: az.gmo +Only in gnumeric-1.8.3/po-functions: bg.gmo +Only in gnumeric-1.8.3/po-functions: ca.gmo +Only in gnumeric-1.8.3/po-functions: cs.gmo +Only in gnumeric-1.8.3/po-functions: da.gmo +Only in gnumeric-1.8.3/po-functions: de.gmo +Only in gnumeric-1.8.3/po-functions: dz.gmo +Only in gnumeric-1.8.3/po-functions: el.gmo +Only in gnumeric-1.8.3/po-functions: en_CA.gmo +Only in gnumeric-1.8.3/po-functions: en_GB.gmo +Only in gnumeric-1.8.3/po-functions: es.gmo +Only in gnumeric-1.8.3/po-functions: et.gmo +Only in gnumeric-1.8.3/po-functions: fi.gmo +Only in gnumeric-1.8.3/po-functions: fr.gmo +Only in gnumeric-1.8.3/po-functions: ga.gmo +Only in gnumeric-1.8.3/po-functions: gl.gmo +Only in gnumeric-1.8.3/po-functions: he.gmo +Only in gnumeric-1.8.3/po-functions: hr.gmo +Only in gnumeric-1.8.3/po-functions: hu.gmo +Only in gnumeric-1.8.3/po-functions: it.gmo +Only in gnumeric-1.8.3/po-functions: ja.gmo +Only in gnumeric-1.8.3/po-functions: ko.gmo +Only in gnumeric-1.8.3/po-functions: lt.gmo +Only in gnumeric-1.8.3/po-functions: lv.gmo +Only in gnumeric-1.8.3/po-functions: mk.gmo +Only in gnumeric-1.8.3/po-functions: ml.gmo +Only in gnumeric-1.8.3/po-functions: mr.gmo +Only in gnumeric-1.8.3/po-functions: ms.gmo +Only in gnumeric-1.8.3/po-functions: nb.gmo +Only in gnumeric-1.8.3/po-functions: ne.gmo +Only in gnumeric-1.8.3/po-functions: nl.gmo +Only in gnumeric-1.8.3/po-functions: nn.gmo +Only in gnumeric-1.8.3/po-functions: oc.gmo +Only in gnumeric-1.8.3/po-functions: pl.gmo +Only in gnumeric-1.8.3/po-functions: pt.gmo +Only in gnumeric-1.8.3/po-functions: pt_BR.gmo +Only in gnumeric-1.8.3/po-functions: ro.gmo +Only in gnumeric-1.8.3/po-functions: ru.gmo +Only in gnumeric-1.8.3/po-functions: rw.gmo +Only in gnumeric-1.8.3/po-functions: sk.gmo +Only in gnumeric-1.8.3/po-functions: sr.gmo +Only in gnumeric-1.8.3/po-functions: sr at Latn.gmo +Only in gnumeric-1.8.3/po-functions: sv.gmo +Only in gnumeric-1.8.3/po-functions: te.gmo +Only in gnumeric-1.8.3/po-functions: tr.gmo +Only in gnumeric-1.8.3/po-functions: uk.gmo +Only in gnumeric-1.8.3/po-functions: vi.gmo +Only in gnumeric-1.8.3/po-functions: zh_CN.gmo +Only in gnumeric-1.8.3/po-functions: zh_TW.gmo +Only in gnumeric-1.8.3/schemas: Makefile +Only in gnumeric-1.8.3/schemas: gnumeric-dialogs.schemas +Only in gnumeric-1.8.3/schemas: gnumeric-general.schemas +Only in gnumeric-1.8.3/schemas: gnumeric-plugins.schemas +Only in gnumeric-1.8.3/src: .deps +Only in gnumeric-1.8.3/src: .libs +Only in gnumeric-1.8.3/src: GNOME_Gnumeric-gtk.xml +Only in gnumeric-1.8.3/src: Makefile +Only in gnumeric-1.8.3/src/cut-n-paste-code: Makefile +Only in gnumeric-1.8.3/src/dialogs: .deps +Only in gnumeric-1.8.3/src/dialogs: .libs +Only in gnumeric-1.8.3/src/dialogs: Makefile +Only in gnumeric-1.8.3/src/dialogs: dao-gui-utils.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-about.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-advanced-filter.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-analysis-tools.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-autocorrect.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-autofilter.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-autoformat.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-autosave.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-cell-comment.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-cell-format.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-cell-sort.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-col-row.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-col-width.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-consolidate.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-data-table.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-define-names.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-delete-cells.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-doc-metadata.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-fill-series.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-formula-guru.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-function-select.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-goal-seek.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-goto-cell.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-hyperlink.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-insert-cells.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-merge.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-password.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-paste-names.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-paste-special.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-plugin-manager.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-preferences.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-printer-setup.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-quit.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-random-generator.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-recent.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-row-height.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-scenarios.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-search-replace.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-search.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-sheet-order.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-shuffle.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-simulation.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-so-list.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-so-styled.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-solver.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf-csv-page.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf-export.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf-fixed-page.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf-format-page.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf-main-page.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf-preview.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-stf.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-tabulate.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-view.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-workbook-attr.lo +Only in gnumeric-1.8.3/src/dialogs: dialog-zoom.lo +Only in gnumeric-1.8.3/src/dialogs: libdialogs.la +Only in gnumeric-1.8.3/src: gnm-marshalers.h +diff -ru gnumeric-1.8.3.orig/src/gnm-so-polygon.c gnumeric-1.8.3/src/gnm-so-polygon.c +--- gnumeric-1.8.3.orig/src/gnm-so-polygon.c 2008-01-15 00:54:39.000000000 +0100 ++++ gnumeric-1.8.3/src/gnm-so-polygon.c 2009-03-16 23:35:49.881228497 +0100 +@@ -223,7 +223,7 @@ + gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output) + { + /* TODO */ +- return gnm_so_polygon_parent_class->write_xml_sax (so, output); ++ gnm_so_polygon_parent_class->write_xml_sax (so, output); + } + + static void +Only in gnumeric-1.8.3/src: gnumeric +Only in gnumeric-1.8.3/src: gnumeric-paths.h +Only in gnumeric-1.8.3/src: io-context-gtk.o +Only in gnumeric-1.8.3/src: libspreadsheet.la +Only in gnumeric-1.8.3/src: libspreadsheet_la-application.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-auto-format.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-cell-draw.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-cell.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-cellspan.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-clipboard.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-cmd-edit.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-collect.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-colrow.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-command-context-stderr.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-command-context.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-commands.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-complete-sheet.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-complete.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-complex.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-consolidate.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-dependent.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-expr-name.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-expr.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-file-autoft.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-format-template.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-func-builtin.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-func.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-datetime.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-format.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-graph-window.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-marshalers.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-pane.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-plugin.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-so-filled.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-so-line.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-so-polygon.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnumeric-gconf.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gnumeric-simple-canvas.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-graph.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gui-clipboard.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gui-file.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gui-util.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-gutils.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-history.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-hlink.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-input-msg.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-item-acetate.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-item-bar.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-item-cursor.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-item-debug.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-item-edit.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-item-grid.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-libgnumeric.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-mathfunc.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-mstyle.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-number-match.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-parse-util.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-parser.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-pattern.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-position.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-preview-grid.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-print-cell.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-print-info.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-print.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-rangefunc-strings.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-rangefunc.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-ranges.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-rendered-value.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-search.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-selection.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-session.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-autofill.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-control-gui.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-control.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-filter.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-merge.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-cell-comment.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-graph.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-image.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-widget.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-style.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-view.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-sort.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-stf-export.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-stf-parse.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-stf.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-str.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-style-border.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-style-color.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-style-conditions.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-style.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-symbol.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-validation.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-value-sheet.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-value.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-wbc-gtk-actions.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-wbc-gtk-edit.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-wbc-gtk.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook-cmd-format.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook-control.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook-view.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-xml-io.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-xml-sax-read.lo +Only in gnumeric-1.8.3/src: libspreadsheet_la-xml-sax-write.lo +Only in gnumeric-1.8.3/src: main-application.o +Only in gnumeric-1.8.3/src/pixmaps: Makefile +Only in gnumeric-1.8.3/src/pixmaps: gnumeric-stock-pixbufs.h +Only in gnumeric-1.8.3/src: ssconvert +Only in gnumeric-1.8.3/src: ssconvert.o +Only in gnumeric-1.8.3/src: ssindex +Only in gnumeric-1.8.3/src: ssindex.o +Only in gnumeric-1.8.3/src/tools: .deps +Only in gnumeric-1.8.3/src/tools: .libs +Only in gnumeric-1.8.3/src/tools: Makefile +Only in gnumeric-1.8.3/src/tools: analysis-histogram.lo +Only in gnumeric-1.8.3/src/tools: analysis-tools.lo +Only in gnumeric-1.8.3/src/tools: auto-correct.lo +Only in gnumeric-1.8.3/src/tools: dao.lo +Only in gnumeric-1.8.3/src/tools: data-shuffling.lo +Only in gnumeric-1.8.3/src/tools: fill-series.lo +Only in gnumeric-1.8.3/src/tools: filter.lo +Only in gnumeric-1.8.3/src/tools: goal-seek.lo +Only in gnumeric-1.8.3/src/tools: libtools.la +Only in gnumeric-1.8.3/src/tools: random-generator.lo +Only in gnumeric-1.8.3/src/tools: scenarios.lo +Only in gnumeric-1.8.3/src/tools: simulation.lo +Only in gnumeric-1.8.3/src/tools/solver: .deps +Only in gnumeric-1.8.3/src/tools/solver: .libs +Only in gnumeric-1.8.3/src/tools/solver: Makefile +Only in gnumeric-1.8.3/src/tools/solver: api.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk: Makefile +Only in gnumeric-1.8.3/src/tools/solver/glpk/include: Makefile +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: .deps +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: .libs +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: Makefile +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpavl.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpdmp.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpinv.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpipp1.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpipp2.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib1a.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib1b.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib2.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib3.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib4.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpp1.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpp2.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx1.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx2.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx3.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx4.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx5.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx6a.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx6c.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx6d.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx7.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx7a.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpluf.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpmip1.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpmip2.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpspx1.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpspx2.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpstr.lo +Only in gnumeric-1.8.3/src/tools/solver/glpk/source: libglpk.la +Only in gnumeric-1.8.3/src/tools/solver: libsolver.la +Only in gnumeric-1.8.3/src/tools/solver/lp_solve: .deps +Only in gnumeric-1.8.3/src/tools/solver/lp_solve: .libs +Only in gnumeric-1.8.3/src/tools/solver/lp_solve: Makefile +Only in gnumeric-1.8.3/src/tools/solver/lp_solve: liblp_solve.la +Only in gnumeric-1.8.3/src/tools/solver/lp_solve: lp_solve.lo +Only in gnumeric-1.8.3/src/tools/solver: reports-write.lo +Only in gnumeric-1.8.3/src/tools/solver: reports.lo +Only in gnumeric-1.8.3/src/tools/solver: solver.lo +Only in gnumeric-1.8.3/src/tools: tabulate.lo +Only in gnumeric-1.8.3/src/widgets: .deps +Only in gnumeric-1.8.3/src/widgets: .libs +Only in gnumeric-1.8.3/src/widgets: Makefile +Only in gnumeric-1.8.3/src/widgets: gnm-cell-combo-foo-view.lo +Only in gnumeric-1.8.3/src/widgets: gnm-dao.lo +Only in gnumeric-1.8.3/src/widgets: gnm-filter-combo-foo-view.lo +Only in gnumeric-1.8.3/src/widgets: gnm-format-sel.lo +Only in gnumeric-1.8.3/src/widgets: gnm-validation-combo-foo-view.lo +Only in gnumeric-1.8.3/src/widgets: gnumeric-cell-renderer-expr-entry.lo +Only in gnumeric-1.8.3/src/widgets: gnumeric-cell-renderer-text.lo +Only in gnumeric-1.8.3/src/widgets: gnumeric-cell-renderer-toggle.lo +Only in gnumeric-1.8.3/src/widgets: gnumeric-dashed-canvas-line.lo +Only in gnumeric-1.8.3/src/widgets: gnumeric-expr-entry.lo +Only in gnumeric-1.8.3/src/widgets: gnumeric-lazy-list.lo +Only in gnumeric-1.8.3/src/widgets: libwidgets.la +Only in gnumeric-1.8.3/src/widgets: widget-editable-label.lo +Only in gnumeric-1.8.3/src/widgets: widget-font-selector.lo +Only in gnumeric-1.8.3: stamp-h1 +Only in gnumeric-1.8.3: stamp-h2 +Only in gnumeric-1.8.3/templates: Makefile +Only in gnumeric-1.8.3/templates/autoformat: Makefile +Only in gnumeric-1.8.3/templates/english: Makefile +Only in gnumeric-1.8.3/test: Makefile +Only in gnumeric-1.8.3/tools: .deps +Only in gnumeric-1.8.3/tools: Makefile +Only in gnumeric-1.8.3/tools/win32: gnumeric.nsi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Mar 17 04:56:02 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 17 Mar 2009 03:56:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[3789] csw/mgar/pkg/gftp/trunk Message-ID: Revision: 3789 http://gar.svn.sourceforge.net/gar/?rev=3789&view=rev Author: jake_goerzen Date: 2009-03-17 03:55:57 +0000 (Tue, 17 Mar 2009) Log Message: ----------- version 2.0.19 update; patch clean up; Makefile clean up Modified Paths: -------------- csw/mgar/pkg/gftp/trunk/Makefile csw/mgar/pkg/gftp/trunk/checksums csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend Added Paths: ----------- csw/mgar/pkg/gftp/trunk/files/lock.c.diff Removed Paths: ------------- csw/mgar/pkg/gftp/trunk/files/intl.diff csw/mgar/pkg/gftp/trunk/files/lock.c.fixed csw/mgar/pkg/gftp/trunk/files/suncc.diff Modified: csw/mgar/pkg/gftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gftp/trunk/Makefile 2009-03-17 03:32:05 UTC (rev 3788) +++ csw/mgar/pkg/gftp/trunk/Makefile 2009-03-17 03:55:57 UTC (rev 3789) @@ -1,28 +1,22 @@ GARNAME = gftp -GARVERSION = 2.0.18 +GARVERSION = 2.0.19 CATEGORIES = utils -DESCRIPTION = A multithreaded ftp app for X. +DESCRIPTION = A file transfer client with text and graphical user interfaces. define BLURB - gFTP is a multithreaded FTP client. It features simultaneous downloads, resuming of interrupted - file transfers, support for the FTP, HTTP, and SSH protocols, file transfer queues, downloading of - entire directories, FTP and HTTP proxy support, remote directory caching, passive and non-passive - file transfers, drag-n-drop support, a very nice connection manager, and more. +A multithreaded file transfer client supporting FTP, FTPS (control connection only), HTTP, HTTPS, SSH and FSP protocols. endef MASTER_SITES = http://www.gftp.org/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgftp, depend ) -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PATCHFILES = lock.c.diff +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += LDFLAGS=-lrt +CONFIGURE_ARGS += LD_OPTIONS=-L/opt/csw/lib -CONFIGURE_ARGS = $(DIRPATHS) --disable-nls - TEST_TARGET = check include gar/category.mk - -pre-configure: - ( cd $(WORKSRC)/lib/fsplib ; gzip -dc $(GARCHIVEDIR)/fsplib-0.9.tar.gz | tar xvf - ; cp /export/home/jgoerzen/csw/gnome/gftp/files/lock.c.fixed lock.c) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/gftp/trunk/checksums =================================================================== --- csw/mgar/pkg/gftp/trunk/checksums 2009-03-17 03:32:05 UTC (rev 3788) +++ csw/mgar/pkg/gftp/trunk/checksums 2009-03-17 03:55:57 UTC (rev 3789) @@ -1,3 +1,4 @@ -44b19442d06f6dc68c7211d66029d826 download/gftp-2.0.18.tar.bz2 +5183cb4955d94be0e03c892585547c64 download/gftp-2.0.19.tar.bz2 351516b0d9da33501cf3be76a1fa7a61 download/CSWgftp.gspec -62f5c9d7c272629c5bf05c03598297fe download/CSWgftp.depend +cf85c5ad82928bf1e4e9d0f89be8378f download/CSWgftp.depend +a80450e02ea01bcc5276f8f2ded3c1d6 download/lock.c.diff Modified: csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend =================================================================== --- csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend 2009-03-17 03:32:05 UTC (rev 3788) +++ csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend 2009-03-17 03:55:57 UTC (rev 3789) @@ -1,10 +1,10 @@ -P CSWreadline readline -P CSWpango libpango -P CSWosslrt openssl_rt -P CSWncurses ncurses -P CSWlibatk libatk -P CSWiconv libiconv -P CSWgtk2 gtk2 -P CSWglib2 glib2 -P CSWggettext ggettext -P CSWlibcairo libcairo +P CSWreadline +P CSWpango +P CSWosslrt +P CSWncurses +P CSWlibatk +P CSWiconv +P CSWgtk2 +P CSWglib2 +P CSWggettextrt +P CSWlibcairo Deleted: csw/mgar/pkg/gftp/trunk/files/intl.diff =================================================================== --- csw/mgar/pkg/gftp/trunk/files/intl.diff 2009-03-17 03:32:05 UTC (rev 3788) +++ csw/mgar/pkg/gftp/trunk/files/intl.diff 2009-03-17 03:55:57 UTC (rev 3789) @@ -1,24 +0,0 @@ -diff -Nru gftp-2.0.16.orig/src/gtk/Makefile.in gftp-2.0.16/src/gtk/Makefile.in ---- gftp-2.0.16.orig/src/gtk/Makefile.in 2003-11-09 06:07:16.000000000 -0800 -+++ gftp-2.0.16/src/gtk/Makefile.in 2004-03-19 16:23:08.575949000 -0800 -@@ -116,7 +116,7 @@ - gftp_gtk_SOURCES = bookmarks.c chmod_dialog.c delete_dialog.c dnd.c gftp-gtk.c menu-items.c misc-gtk.c mkdir_dialog.c options_dialog.c rename_dialog.c transfer.c view_dialog.c - - INCLUDES = @GTK_CFLAGS@ @PTHREAD_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -I../../intl --LDADD = ../../lib/libgftp.a @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ @SSL_LIBS@ -+LDADD = ../../lib/libgftp.a @LIBINTL@ @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ @SSL_LIBS@ - noinst_HEADERS = gftp-gtk.h - localedir = $(datadir)/locale - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -diff -Nru gftp-2.0.16.orig/src/text/Makefile.in gftp-2.0.16/src/text/Makefile.in ---- gftp-2.0.16.orig/src/text/Makefile.in 2003-11-09 06:07:15.000000000 -0800 -+++ gftp-2.0.16/src/text/Makefile.in 2004-03-19 16:22:17.256017000 -0800 -@@ -115,7 +115,7 @@ - EXTRA_PROGRAMS = gftp-text - gftp_text_SOURCES = gftp-text.c - INCLUDES = @GLIB_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -I../../intl --LDADD = ../../lib/libgftp.a @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ @SSL_LIBS@ -+LDADD = ../../lib/libgftp.a @LIBINTL@ @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ @SSL_LIBS@ - noinst_HEADERS = gftp-text.h - localedir = $(datadir)/locale - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs Added: csw/mgar/pkg/gftp/trunk/files/lock.c.diff =================================================================== --- csw/mgar/pkg/gftp/trunk/files/lock.c.diff (rev 0) +++ csw/mgar/pkg/gftp/trunk/files/lock.c.diff 2009-03-17 03:55:57 UTC (rev 3789) @@ -0,0 +1,32 @@ +diff --speed-large-files --minimal -Nru gftp-2.0.19.orig/lib/fsplib/lock.c gftp-2.0.19/lib/fsplib/lock.c +--- gftp-2.0.19.orig/lib/fsplib/lock.c 2008-11-29 13:47:18.000000000 +0100 ++++ gftp-2.0.19/lib/fsplib/lock.c 2009-03-17 04:22:26.936537459 +0100 +@@ -52,7 +52,7 @@ + int val; + struct semid_ds *buf; + unsigned short int *array; +- struct seminfo *__buf; ++// struct seminfo *__buf; + }; + #endif + +@@ -91,7 +91,7 @@ + mode_t omask; + key_t lock_key; + int fd; +- union semun su; ++ union semun; + struct sembuf sem; + + make_key_string(lock,server_addr,server_port); +@@ -123,8 +123,8 @@ + return -1; + } + /* we need to init this semaphore */ +- su.val=1; +- if(semctl(lock->lock_sem,0,SETVAL,su) == -1) ++ // arg.val=1; ++ if(semctl(lock->lock_sem,0,SETVAL) == -1) + { + perror("semctl setval"); + return -1; Deleted: csw/mgar/pkg/gftp/trunk/files/lock.c.fixed =================================================================== --- csw/mgar/pkg/gftp/trunk/files/lock.c.fixed 2009-03-17 03:32:05 UTC (rev 3788) +++ csw/mgar/pkg/gftp/trunk/files/lock.c.fixed 2009-03-17 03:55:57 UTC (rev 3789) @@ -1,285 +0,0 @@ -#include -#include -#include "lock.h" - -/* ************ Locking functions ***************** */ -#ifndef FSP_NOLOCKING - -static char code_str[] = - "0123456789:_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - -static void make_key_string( FSP_LOCK *lock, - unsigned long server_addr, - unsigned long server_port) -{ - unsigned long v1, v2; - char *p; - - strcpy(lock->key_string,FSP_KEY_PREFIX); - for(p = lock->key_string; *p; p++); - v1 = server_addr; - v2 = server_port; - - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - v1 = v1 | (v2 << (32-3*6)); - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p++ = code_str[v1 & 0x3f]; v1 >>= 6; - *p = 0; -} -#endif - -/********************************************************************/ -/******* For those systems that has SysV shared memory + semop ******/ -/********************************************************************/ -#ifdef FSP_USE_SHAREMEM_AND_SEMOP - -#include -#include -#include -#include -#include -#include -#include - -#ifdef _SEM_SEMUN_UNDEFINED -union semun -{ - int val; - struct semid_ds *buf; - unsigned short int *array; -// struct seminfo *__buf; -}; -#endif - -unsigned short client_get_key (FSP_LOCK *lock) -{ - struct sembuf sem; - sem.sem_num = 0; - sem.sem_op = -1; - sem.sem_flg = SEM_UNDO; - - if(semop(lock->lock_sem,&sem,1) == -1 ) - { - perror("semop lock"); - } - return(*lock->share_key); -} - -void client_set_key (FSP_LOCK *lock,unsigned short key) -{ - struct sembuf sem; - - sem.sem_num = 0; - sem.sem_op = 1; - sem.sem_flg = SEM_UNDO; - - *lock->share_key = key; - if(semop(lock->lock_sem,&sem,1) == -1) { - perror("semop unlock"); - } -} - -int client_init_key (FSP_LOCK *lock, - unsigned long server_addr, - unsigned short server_port) -{ - mode_t omask; - key_t lock_key; - int fd; - union semun; - struct sembuf sem; - - make_key_string(lock,server_addr,server_port); - - omask = umask(0); - fd = open(lock->key_string,O_RDWR|O_CREAT,0666); - umask(omask); - close(fd); - - if((lock_key = ftok(lock->key_string,238)) == -1) { - perror("ftok"); - return -1; - } - - if((lock->lock_shm = shmget(lock_key,2*sizeof(unsigned int),IPC_CREAT|0666)) == -1) { - perror("shmget"); - return -1; - } - - if(!(lock->share_key = (unsigned int *) shmat(lock->lock_shm,NULL,0))) { - perror("shmat"); - return -1; - } - - if((lock->lock_sem = semget(lock_key,0,0)) == -1) { - /* create a new semaphore and init it */ - if((lock->lock_sem = semget(lock_key,2,IPC_CREAT|0666)) == -1) { - perror("semget"); - return -1; - } - /* we need to init this semaphore */ - // arg.val=1; - if(semctl(lock->lock_sem,0,SETVAL) == -1) - { - perror("semctl setval"); - return -1; - } - } - - /* increase in use counter */ - sem.sem_num = 1; - sem.sem_op = 1; - sem.sem_flg = SEM_UNDO; - - if(semop(lock->lock_sem,&sem,1) == -1) { - perror("semop incuse"); - } - - return 0; -} - -void client_destroy_key(FSP_LOCK *lock) -{ - int rc; - struct sembuf sem; - - if (shmdt(lock->share_key) < 0) - { - perror("shmdt"); - return; - } - /* check if we are only one process holding lock */ - rc = semctl(lock->lock_sem,1,GETVAL); - if (rc == 1) - { - /* safe to destroy */ - if ( - (semctl(lock->lock_sem,0,IPC_RMID) < 0) || - (shmctl(lock->lock_shm,IPC_RMID,NULL) < 0) || - (unlink(lock->key_string) < 0) ) - rc=0;/* ignore cleanup errors */ - } - else - if(rc > 1) - { - /* we need to decrease sem. */ - sem.sem_num = 1; - sem.sem_op = -1; - sem.sem_flg = SEM_UNDO; - - if(semop(lock->lock_sem,&sem,1) == -1) { - perror("semop decuse"); - } - } -} -#endif - - -/********************************************************************/ -/******* For those who do not want to use locking *******************/ -/********************************************************************/ -#ifdef FSP_NOLOCKING - -unsigned short client_get_key (FSP_LOCK *lock) -{ - return lock->share_key; -} - -void client_set_key (FSP_LOCK *lock,unsigned short key) -{ - lock->share_key=key; -} - -int client_init_key (FSP_LOCK *lock, - unsigned long server_addr, - unsigned short server_port) -{ - return 0; -} - -void client_destroy_key(FSP_LOCK *lock) -{ - return; -} -#endif - -/********************************************************************/ -/******* For those systems that has lockf function call *************/ -/********************************************************************/ -#ifdef FSP_USE_LOCKF - -#include -#include -#include - -unsigned short client_get_key (FSP_LOCK *lock) -{ - unsigned int okey; - - if (lockf(lock->lock_fd, F_LOCK, sizeof(okey)) < 0) - { - perror("lockf"); - } - - if (read(lock->lock_fd, &okey, sizeof(okey)) < 0) - { - perror("readlk"); - } - - if (lseek(lock->lock_fd, 0L, 0) < 0) - { - perror("seek"); - } - - return(okey); -} - -void client_set_key (FSP_LOCK *lock,unsigned short nkey) -{ - unsigned int key; - - key=nkey; - - if (write(lock->lock_fd, &key, sizeof(key)) < 0) - { - perror("write"); - } - if (lseek(lock->lock_fd, 0L, 0) < 0) - { - perror("seek"); - } - if (lockf(lock->lock_fd, F_ULOCK, sizeof(key)) < 0) - { - perror("unlockf"); - } -} - -int client_init_key (FSP_LOCK *lock, - unsigned long server_addr, - unsigned short server_port) -{ - mode_t omask; - - make_key_string(lock,server_addr, server_port); - - omask = umask(0); - lock->lock_fd = open(lock->key_string, O_RDWR | O_CREAT, 0666); - (void)umask(omask); - - if(lock->lock_fd < 0) - return -1; - else - return 0; -} - -void -client_destroy_key(FSP_LOCK *lock) -{ - (void)close(lock->lock_fd); -} -#endif Deleted: csw/mgar/pkg/gftp/trunk/files/suncc.diff =================================================================== --- csw/mgar/pkg/gftp/trunk/files/suncc.diff 2009-03-17 03:32:05 UTC (rev 3788) +++ csw/mgar/pkg/gftp/trunk/files/suncc.diff 2009-03-17 03:55:57 UTC (rev 3789) @@ -1,12 +0,0 @@ -diff -Nru gftp-2.0.16.orig/src/gtk/gftp-gtk.h gftp-2.0.16/src/gtk/gftp-gtk.h ---- gftp-2.0.16.orig/src/gtk/gftp-gtk.h 2003-11-02 18:14:04.000000000 -0800 -+++ gftp-2.0.16/src/gtk/gftp-gtk.h 2004-03-19 16:13:36.806207000 -0800 -@@ -291,7 +291,7 @@ - void ftp_log ( gftp_logging_level level, - gftp_request * request, - const char *string, -- ... ) __attribute__((format(printf, 3, 4))); -+ ... ); - - void refresh ( gftp_window_data * wdata ); - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Mar 17 07:57:36 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 17 Mar 2009 06:57:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[3790] csw/mgar/pkg/facter/trunk/Makefile Message-ID: Revision: 3790 http://gar.svn.sourceforge.net/gar/?rev=3790&view=rev Author: hson Date: 2009-03-17 06:57:36 +0000 (Tue, 17 Mar 2009) Log Message: ----------- facter: Makefile update Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2009-03-17 03:55:57 UTC (rev 3789) +++ csw/mgar/pkg/facter/trunk/Makefile 2009-03-17 06:57:36 UTC (rev 3790) @@ -4,12 +4,20 @@ DESCRIPTION = a system fact gatherer define BLURB - Long description + A cross-platform Ruby library for retrieving facts from operating systems. + Supports multiple resolution mechanisms, any of which can be restricted to + working only on certain operating systems or environments. Facter is + especially useful for retrieving things like operating system names, IP + addresses, MAC addresses, and SSH keys. + + It is easy to extend Facter to include your own custom facts or to include + additional mechanisms for retrieving facts. endef MASTER_SITES = http://reductivelabs.com/downloads/facter/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz +PREREQUISITE_PKGS += CSWruby REQUIRED_PKGS = CSWruby # We define upstream file regex so we can be notifed of new upstream software release @@ -17,22 +25,12 @@ ARCHALL=1 -CONFIGURE_SCRIPTS = none -BUILD_SCRIPTS = none -TEST_SCRIPTS = none +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = INSTALL_SCRIPTS = facter include gar/category.mk -configure-none: - @$(MAKECOOKIE) - -test-none: - @$(MAKECOOKIE) - -build-none: - @$(MAKECOOKIE) - install-facter: - @ginstall -d $(DESTDIR) - (cd $(WORKDIR)/$(DISTNAME); DESTDIR=$(DESTDIR) ruby install.rb) + (cd $(WORKDIR)/$(DISTNAME); ruby install.rb --destdir=$(DESTDIR)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From roger.hakansson at gmail.com Tue Mar 17 08:00:17 2009 From: roger.hakansson at gmail.com (=?UTF-8?B?Um9nZXIgSMOla2Fuc3Nvbg==?=) Date: Tue, 17 Mar 2009 08:00:17 +0100 Subject: [csw-devel] SF.net SVN: gar:[3773] csw/mgar/pkg In-Reply-To: References: Message-ID: <49BF4A81.6080009@gmail.com> Maciej Blizi?ski wrote: > Hi Roger, > > A handful of comments below. > Committed -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/x-pkcs7-signature Size: 3331 bytes Desc: S/MIME Cryptographic Signature URL: From dmichelsen at users.sourceforge.net Tue Mar 17 13:37:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Mar 2009 12:37:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[3791] csw/mgar/pkg Message-ID: Revision: 3791 http://gar.svn.sourceforge.net/gar/?rev=3791&view=rev Author: dmichelsen Date: 2009-03-17 12:37:47 +0000 (Tue, 17 Mar 2009) Log Message: ----------- xbill: Initial commit Added Paths: ----------- csw/mgar/pkg/xbill/ csw/mgar/pkg/xbill/branches/ csw/mgar/pkg/xbill/tags/ csw/mgar/pkg/xbill/trunk/ csw/mgar/pkg/xbill/trunk/Makefile csw/mgar/pkg/xbill/trunk/checksums csw/mgar/pkg/xbill/trunk/files/ Property changes on: csw/mgar/pkg/xbill/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xbill/trunk/Makefile =================================================================== --- csw/mgar/pkg/xbill/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xbill/trunk/Makefile 2009-03-17 12:37:47 UTC (rev 3791) @@ -0,0 +1,37 @@ +GARNAME = xbill +GARVERSION = 2.1 +CATEGORIES = apps + +DESCRIPTION = Seek out and destroy all forms of Bill +define BLURB + Ever get the feeling that nothing is going right? You're a sysadmin, + and someone's trying to destroy your computers. The little people + running around the screen are trying to infect your computers with + Wingdows [TM], a virus cleverly designed to resemble a popular + operating system. Additionally, some computers are connected with + network cables. When one computer on a network becomes infected, + a spark will be sent down the cable, and will infect the computer + on the other end when it reaches there. +endef + +MASTER_SITES = http://www.xbill.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://www.xbill.org + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +REQUIRED_PKGS = CSWglib CSWgtk CSWxaw3d CSWxpm + +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_LDFLAGS = -L$(libdir) -lXpm -lX11 + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/xbill/trunk/checksums =================================================================== --- csw/mgar/pkg/xbill/trunk/checksums (rev 0) +++ csw/mgar/pkg/xbill/trunk/checksums 2009-03-17 12:37:47 UTC (rev 3791) @@ -0,0 +1 @@ +585e4866b15255a24203db9959407b2f download/xbill-2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Mar 17 15:23:01 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 17 Mar 2009 14:23:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3792] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 3792 http://gar.svn.sourceforge.net/gar/?rev=3792&view=rev Author: harpchad Date: 2009-03-17 14:23:01 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Update to 0.40.6, gar v2 Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/intltool/trunk/ Property changes on: csw/mgar/pkg/intltool/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2009-03-17 12:37:47 UTC (rev 3791) +++ csw/mgar/pkg/intltool/trunk/Makefile 2009-03-17 14:23:01 UTC (rev 3792) @@ -1,6 +1,6 @@ GARNAME = intltool MAJOR_VER = 0.40 -MINOR_VER = 5 +MINOR_VER = 6 GARVERSION = $(MAJOR_VER).$(MINOR_VER) GNOME_SUBV = $(MAJOR_VER) CATEGORIES = utils @@ -12,17 +12,11 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWintltool,depend prototype) -#No tests -TEST_SCRIPTS = - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums 2009-03-17 12:37:47 UTC (rev 3791) +++ csw/mgar/pkg/intltool/trunk/checksums 2009-03-17 14:23:01 UTC (rev 3792) @@ -1,4 +1 @@ -157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz -fd19c6295f6211062d4e4cdd93bc3278 download/CSWintltool.depend -792a4a570fa86f7a275114b99fc9adbe download/CSWintltool.gspec -7ea28b8cc2a8f3179d50cd2a5c66c04e download/CSWintltool.prototype +8e40f9d1c7308eddbfd24b22cd540631 download/intltool-0.40.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Mar 17 15:31:09 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 17 Mar 2009 14:31:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[3793] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 3793 http://gar.svn.sourceforge.net/gar/?rev=3793&view=rev Author: harpchad Date: 2009-03-17 14:31:08 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Clean up gar v1 files Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/intltool/trunk/files/ Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2009-03-17 14:23:01 UTC (rev 3792) +++ csw/mgar/pkg/intltool/trunk/Makefile 2009-03-17 14:31:08 UTC (rev 3793) @@ -18,6 +18,8 @@ TEST_TARGET = check +REQUIRED_PKGS_CSWintltool = CSWperl + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Mar 17 15:40:15 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 17 Mar 2009 14:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[3794] csw/mgar/pkg/intltool/trunk/Makefile Message-ID: Revision: 3794 http://gar.svn.sourceforge.net/gar/?rev=3794&view=rev Author: harpchad Date: 2009-03-17 14:40:14 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Add dependency: CSWpmxmlparser Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2009-03-17 14:31:08 UTC (rev 3793) +++ csw/mgar/pkg/intltool/trunk/Makefile 2009-03-17 14:40:14 UTC (rev 3794) @@ -18,7 +18,7 @@ TEST_TARGET = check -REQUIRED_PKGS_CSWintltool = CSWperl +REQUIRED_PKGS_CSWintltool = CSWperl CSWpmxmlparser CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ggunselm at emporia.edu Tue Mar 17 17:49:19 2009 From: ggunselm at emporia.edu (Glen Gunselman) Date: Tue, 17 Mar 2009 11:49:19 -0500 Subject: [csw-devel] Orca and friends packages Message-ID: <49BF8E3F.CC54.005D.3@emporia.edu> I'm interested in installing Orca in a Solaris 5/08 environment.What is the status of the CSW Orca and friends packages? Can someone point me to the instructions for installing using the CSW packages? Thanks, [csw-devel] New in testing: SE Toolkit 3.5.0 and Orca r535Dagobert Michelsen dam at opencsw.org ( mailto:devel%40lists.opencsw.org?Subject=%5Bcsw-devel%5D%20New%20in%20testing%3A%20SE%20Toolkit%203.5.0%20and%20Orca%20r535&In-Reply-To= ) Thu Nov 6 09:17:48 CET 2008Hi, new in testing are current versions of the SE Toolkit 3.5.0 and the latest Orca r535: setoolkit-3.5.0,REV=2008.11.06-SunOS5.8-sparc-CSW.pkg.gz setoolkit-3.5.0,REV=2008.11.06-SunOS5.8-i386-CSW.pkg.gz orca-r535,REV=2008.11.06-SunOS5.8-sparc-CSW.pkg.gz orca-r535,REV=2008.11.06-SunOS5.8-i386-CSW.pkg.gz orca_web-r535,REV=2008.11.06-SunOS5.8-sparc-CSW.pkg.gz orca_web-r535,REV=2008.11.06-SunOS5.8-i386-CSW.pkg.gz The SMF/RC integration is not finished yet, but zoom and orcallator should be running fine when started manually. Feedback as always welcome. Best regards -- Dago Glen Gunselman Systems Software Specialist TCS Emporia State University -------------- next part -------------- An HTML attachment was scrubbed... URL: From skayser at users.sourceforge.net Tue Mar 17 18:37:03 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Mar 2009 17:37:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3795] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 3795 http://gar.svn.sourceforge.net/gar/?rev=3795&view=rev Author: skayser Date: 2009-03-17 17:37:02 +0000 (Tue, 17 Mar 2009) Log Message: ----------- dovecot: added cmusieve plugin (CSWdovecot-sieve) Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-17 14:40:14 UTC (rev 3794) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-17 17:37:02 UTC (rev 3795) @@ -13,18 +13,25 @@ MASTER_SITES = http://dovecot.org/releases/1.1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWdovecot CSWdovecotdevel +PACKAGES = CSWdovecot CSWdovecotdevel CSWdovecot-sieve CATALOGNAME_CSWdovecotdevel = dovecot_devel +CATALOGNAME_CSWdovecot-sieve = dovecot_sieve +# CSWdovecot is not installed on the build farm and as such its dependent +# packages throw errors when fed to checkpkg +ENABLE_CHECK=0 + SPKG_SOURCEURL = http://dovecot.org/ SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecotdevel = Dovecot secure IMAP server header files +SPKG_DESC_CSWdovecot-sieve = Dovecot secure IMAP server sieve plugin SPKG_CLASSES_CSWdovecot = none cswusergroup cswcpsampleconf cswinitsmf REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq REQUIRED_PKGS_CSWdovecot += CSWsasl CSWsqlite3 CSWzlib CSWlibnet REQUIRED_PKGS_CSWdovecot += CSWbzip2 CSWiconv CSWcswclassutils REQUIRED_PKGS_CSWdovecotdevel = CSWdovecot +REQUIRED_PKGS_CSWdovecot-sieve = CSWdovecot PREREQUISITE_PKGS = CSWossldevel CSWosslrt PREREQUISITE_PKGS += CSWmysql5devel CSWmysql5rt @@ -33,6 +40,7 @@ PREREQUISITE_PKGS += CSWsqlite3 CSWsqlite3dev PKGFILES_CSWdovecotdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWdovecot-sieve = .*sieve.* # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -62,7 +70,7 @@ EXTRA_LIB = /opt/csw/mysql5/lib/mysql /opt/csw/postgresql/lib EXTRA_INC = /opt/csw/mysql5/include/mysql /opt/csw/postgresql/include -STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot +STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot PROTOTYPE_FILTER = awk '\ $$$$3 ~ /\/init.d\/cswdovecot$$$$/ { $$$$2 = "cswinitsmf" } \ @@ -76,6 +84,8 @@ include gar/category.mk # Maybe there is a nicer way to build this via modulations ... +build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS) +build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC) build-and-install-sieveplugin: @echo @echo [===== NOW BUILDING extra cmusieve plugin =====] @@ -83,9 +93,9 @@ @wget -nc http://www.dovecot.org/releases/sieve/dovecot-sieve-1.1.6.tar.gz @gtar xzf dovecot-sieve-1.1.6.tar.gz @(cd dovecot-sieve-1.1.6; \ - ./configure $(DIRPATHS) --with-dovecot=../$(WORKSRC); \ - gmake; \ - gmake DESTDIR=$(DESTDIR) install; ) + $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \ + $(BUILD_ENV) gmake $(BUILD_ARGS); \ + $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) @rm -rf dovecot-sieve-1.1.6* post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Mar 17 22:22:23 2009 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 17 Mar 2009 22:22:23 +0100 Subject: [csw-devel] Orca and friends packages In-Reply-To: <49BF8E3F.CC54.005D.3@emporia.edu> References: <49BF8E3F.CC54.005D.3@emporia.edu> Message-ID: <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> Hi Glen, Am 17.03.2009 um 17:49 schrieb Glen Gunselman: > I'm interested in installing Orca in a Solaris 5/08 environment. > What is the status of the CSW Orca and friends packages? Can > someone point me to the instructions for installing using the CSW > packages? Basically the packages are ready for use, but the start-scripts are still without SMF-support. Do you know how to operate Orca in general or should I write some small how-to? Best regards -- Dago -------------- next part -------------- An HTML attachment was scrubbed... URL: From wbonnet at users.sourceforge.net Tue Mar 17 23:08:53 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 17 Mar 2009 22:08:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[3796] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 3796 http://gar.svn.sourceforge.net/gar/?rev=3796&view=rev Author: wbonnet Date: 2009-03-17 22:08:52 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Release to testing Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-17 17:37:02 UTC (rev 3795) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2009-03-17 22:08:52 UTC (rev 3796) @@ -18,17 +18,13 @@ UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz # Package description -SPKG_DESC_CSWsqlite3 = The XCB library +SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) SPKG_DESC_CSWsqlite3devel = $(SPKG_DESC_CSWsqlite3) development package # Dynamic prototype PKGFILES_CSWsqlite3devel = $(PKGFILES_DEVEL) -PKGFILES_CSWsqlite3devel += $(prefix)/include/.* -PKGFILES_CSWsqlite3devel += $(prefix)/lib/.*\.a -PKGFILES_CSWsqlite3devel += $(prefix)/lib/pkgconfig/.* # Build the 64 bits binaries -BUILD64 = 1 NO_ISAEXEC = 1 EXTRA_BUILD_ISAS_sparc = sparcv9 @@ -42,8 +38,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threadsafe --disable-debug -#REQUIRED_PKGS_CSWlibxcbdevel = CSWlibxcb - test-none: @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ggunselm at emporia.edu Wed Mar 18 00:01:29 2009 From: ggunselm at emporia.edu (Glen Gunselman) Date: Tue, 17 Mar 2009 18:01:29 -0500 Subject: [csw-devel] Orca and friends packages In-Reply-To: <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> Message-ID: <49BFE579.CC54.005D.3@emporia.edu> Dago, I know a little about using Orca but very little about installing it. I will have an LDom on a T5220 to test on running Solaris 10 5/08. If you could provide some "how-to" that would really help. Thanks, Glen Gunselman Systems Software Specialist TCS Emporia State University >>> Dagobert Michelsen 3/17/2009 4:22 PM >>> Hi Glen, Am 17.03.2009 um 17:49 schrieb Glen Gunselman: I'm interested in installing Orca in a Solaris 5/08 environment.What is the status of the CSW Orca and friends packages? Can someone point me to the instructions for installing using the CSW packages? Basically the packages are ready for use, but the start-scripts are still without SMF-support. Do you know how to operate Orca in general or should I write some small how-to? Best regards -- Dago -------------- next part -------------- An HTML attachment was scrubbed... URL: From wbonnet at users.sourceforge.net Wed Mar 18 00:44:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 17 Mar 2009 23:44:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3797] csw/mgar/gar/v2/categories/x11/category.mk Message-ID: Revision: 3797 http://gar.svn.sourceforge.net/gar/?rev=3797&view=rev Author: wbonnet Date: 2009-03-17 23:44:18 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Fix bugs : https://sourceforge.net/tracker2/?func=detail&aid=2682000&group_id=229205&atid=1075770 CONFIGURE_ARGS should not contains $(DIRPATHS) libdir is wrong (/opt/csw/X11 instead of /opt/csw/X11/lib) https://sourceforge.net/tracker2/?func=detail&aid=2681997&group_id=229205&atid=1075770 Compiler options are invalid for GCC Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2009-03-17 22:08:52 UTC (rev 3796) +++ csw/mgar/gar/v2/categories/x11/category.mk 2009-03-17 23:44:18 UTC (rev 3797) @@ -2,12 +2,15 @@ X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ -# C compiler flags -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION +# C and C++ compiler flags +ifeq ($(GARCOMPILER),GNU) + CFLAGS += + CXXFLAGS += +else + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION + CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath +endif -# C++ compiler flags -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath - # Preprocessor flags # Linker flags @@ -24,10 +27,9 @@ PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/X11/lib/pkgconfig # Configure common options -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --prefix=/opt/csw/X11 +CONFIGURE_ARGS = --prefix=/opt/csw/X11 CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 -CONFIGURE_ARGS += --libdir=/opt/csw/X11 +CONFIGURE_ARGS += --libdir=/opt/csw/X11/lib CONFIGURE_ARGS += --includedir=/opt/csw/X11/include CONFIGURE_ARGS += --datadir=/opt/csw/X11/share CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Mar 18 00:48:01 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 17 Mar 2009 23:48:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3798] csw/mgar/pkg/freeciv/trunk Message-ID: Revision: 3798 http://gar.svn.sourceforge.net/gar/?rev=3798&view=rev Author: jake_goerzen Date: 2009-03-17 23:48:01 +0000 (Tue, 17 Mar 2009) Log Message: ----------- integrate patch into mGAR: remove stdint.h test in configure Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freeciv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeciv/trunk/files/configure.diff Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2009-03-17 23:44:18 UTC (rev 3797) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2009-03-17 23:48:01 UTC (rev 3798) @@ -14,11 +14,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322 UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU -PATCHFILES = dataio.c.diff +PATCHFILES = dataio.c.diff configure.diff TEST_SCRIPTS = Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2009-03-17 23:44:18 UTC (rev 3797) +++ csw/mgar/pkg/freeciv/trunk/checksums 2009-03-17 23:48:01 UTC (rev 3798) @@ -3,3 +3,4 @@ fee60b5af7c882c2eb16a8ca622e3958 download/CSWfreeciv.depend d3acfde4316e7011beccd69b21d2ad67 download/CSWfreeciv.prototype 892be308fb8a4e34f0e98083de3e1788 download/dataio.c.diff +1521ec035d8abe47106b2f3ffe7a0d38 download/configure.diff Added: csw/mgar/pkg/freeciv/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/freeciv/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/freeciv/trunk/files/configure.diff 2009-03-17 23:48:01 UTC (rev 3798) @@ -0,0 +1,15 @@ +diff --speed-large-files --minimal -Nru freeciv-2.1.8.orig/configure freeciv-2.1.8/configure +--- freeciv-2.1.8.orig/configure 2008-11-30 14:18:36.000000000 +0100 ++++ freeciv-2.1.8/configure 2009-03-17 17:21:06.908829612 +0100 +@@ -10636,11 +10636,6 @@ + fi + echo "$as_me:$LINENO: result: $ac_cv_c99_stdint_h" >&5 + echo "${ECHO_T}$ac_cv_c99_stdint_h" >&6 +- if test "${ac_cv_c99_stdint_h}" != "yes"; then +- { { echo "$as_me:$LINENO: error: A compiler supporting C99's stdint.h is required" >&5 +-echo "$as_me: error: A compiler supporting C99's stdint.h is required" >&2;} +- { (exit 1); exit 1; }; } +- fi + + + if test "$AUTO_DEPS" = "maybe"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Mar 18 05:12:10 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 18 Mar 2009 04:12:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[3799] csw/mgar/pkg/gftp/trunk Message-ID: Revision: 3799 http://gar.svn.sourceforge.net/gar/?rev=3799&view=rev Author: jake_goerzen Date: 2009-03-18 04:12:10 +0000 (Wed, 18 Mar 2009) Log Message: ----------- fix patch file Modified Paths: -------------- csw/mgar/pkg/gftp/trunk/checksums csw/mgar/pkg/gftp/trunk/files/lock.c.diff Modified: csw/mgar/pkg/gftp/trunk/checksums =================================================================== --- csw/mgar/pkg/gftp/trunk/checksums 2009-03-17 23:48:01 UTC (rev 3798) +++ csw/mgar/pkg/gftp/trunk/checksums 2009-03-18 04:12:10 UTC (rev 3799) @@ -1,4 +1,4 @@ 5183cb4955d94be0e03c892585547c64 download/gftp-2.0.19.tar.bz2 351516b0d9da33501cf3be76a1fa7a61 download/CSWgftp.gspec cf85c5ad82928bf1e4e9d0f89be8378f download/CSWgftp.depend -a80450e02ea01bcc5276f8f2ded3c1d6 download/lock.c.diff +79a0159a3c22538328e40cccc13be50c download/lock.c.diff Modified: csw/mgar/pkg/gftp/trunk/files/lock.c.diff =================================================================== --- csw/mgar/pkg/gftp/trunk/files/lock.c.diff 2009-03-17 23:48:01 UTC (rev 3798) +++ csw/mgar/pkg/gftp/trunk/files/lock.c.diff 2009-03-18 04:12:10 UTC (rev 3799) @@ -1,32 +1,16 @@ diff --speed-large-files --minimal -Nru gftp-2.0.19.orig/lib/fsplib/lock.c gftp-2.0.19/lib/fsplib/lock.c --- gftp-2.0.19.orig/lib/fsplib/lock.c 2008-11-29 13:47:18.000000000 +0100 -+++ gftp-2.0.19/lib/fsplib/lock.c 2009-03-17 04:22:26.936537459 +0100 -@@ -52,7 +52,7 @@ - int val; - struct semid_ds *buf; - unsigned short int *array; -- struct seminfo *__buf; -+// struct seminfo *__buf; - }; - #endif - -@@ -91,7 +91,7 @@ ++++ gftp-2.0.19/lib/fsplib/lock.c 2009-03-18 04:46:10.916531020 +0100 +@@ -91,7 +91,11 @@ mode_t omask; key_t lock_key; int fd; - union semun su; -+ union semun; ++ union semun { ++ int val; ++ struct semid_ds *buf; ++ ushort *array; ++ } su; struct sembuf sem; make_key_string(lock,server_addr,server_port); -@@ -123,8 +123,8 @@ - return -1; - } - /* we need to init this semaphore */ -- su.val=1; -- if(semctl(lock->lock_sem,0,SETVAL,su) == -1) -+ // arg.val=1; -+ if(semctl(lock->lock_sem,0,SETVAL) == -1) - { - perror("semctl setval"); - return -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej.blizinski at gmail.com Wed Mar 18 09:57:58 2009 From: maciej.blizinski at gmail.com (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 18 Mar 2009 08:57:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3797] csw/mgar/gar/v2/categories/x11/category.mk In-Reply-To: References: Message-ID: On Tue, Mar 17, 2009 at 11:44 PM, wrote: > +ifeq ($(GARCOMPILER),GNU) Can GARCOMPILER be tested for GCC3 and GCC4 as well? From skayser at users.sourceforge.net Wed Mar 18 14:44:55 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Mar 2009 13:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[3800] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 3800 http://gar.svn.sourceforge.net/gar/?rev=3800&view=rev Author: skayser Date: 2009-03-18 13:44:54 +0000 (Wed, 18 Mar 2009) Log Message: ----------- dovecot: adjusted path references Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-18 04:12:10 UTC (rev 3799) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-18 13:44:54 UTC (rev 3800) @@ -50,6 +50,8 @@ # See http://dovecot.org/list/dovecot/2009-February/037273.html PATCHFILES = patch-authcrash.diff +# Adjust the comment about file paths in the example conf header +PATCHFILES = patch-exampleconf.diff # Override some paths for configure localstatedir=/var/opt/csw @@ -83,6 +85,19 @@ include gar/category.mk +# Adjust file paths in various files. Not a prerequisite to the remaining build +# process, but i found it easiest # to put it here and not clutter post-install +# even more +pre-install-modulated: + @perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh + @perl -pi -e '\ + s| /var/run| /var/opt/csw/run|; \ + s| /etc/ssl| /opt/csw/ssl|; \ + s| /usr/libexec| /opt/csw/libexec|; \ + s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \ + ' $(WORKSRC)/dovecot-example.conf + @$(MAKECOOKIE) + # Maybe there is a nicer way to build this via modulations ... build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS) build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC) @@ -97,6 +112,7 @@ $(BUILD_ENV) gmake $(BUILD_ARGS); \ $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) @rm -rf dovecot-sieve-1.1.6* + @$(MAKECOOKIE) post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT post-install-modulated: CSWDOCS = changelog.CSW README.CSW Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2009-03-18 04:12:10 UTC (rev 3799) +++ csw/mgar/pkg/dovecot/trunk/checksums 2009-03-18 13:44:54 UTC (rev 3800) @@ -1,3 +1,2 @@ c973eb41aca79fb16630a16f0d84f765 download/dovecot-1.1.11.tar.gz -f8e71a5be649e71131cf1ad7ea11019a download/CSWdovecot.preinstall -1f39cae3a38d10169fe31f246095b67f download/patch-authcrash.diff +765a31bece26ed3cebee784dc4aa8216 download/patch-exampleconf.diff Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-03-18 04:12:10 UTC (rev 3799) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-03-18 13:44:54 UTC (rev 3800) @@ -1,7 +1,7 @@ dovecot (1.1.11) REV=2009.03.15 * Package adopted again and updated to 1.1.11. - * Tested and validated LDAP interopability with PAM. (Closes: #) - * TBD .... + * Tested and validated LDAP interopability with PAM. (Closes: #2760) + * Adjusted SSLDIR in mkcert.sh. (Closes: #3027) -- Sebastian Kayser Sun, 15 Mar 2009 18:19:59 +0100 Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-18 04:12:10 UTC (rev 3799) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-18 13:44:54 UTC (rev 3800) @@ -11,8 +11,8 @@ test -x $DAEMON || exit 1 set -e -CONF=/opt/csw/etc/dovecot/dovecot.conf -CONF_LOCAL=/etc/opt/csw/dovecot/dovecot.conf +CONF=/opt/csw/etc/dovecot.conf +CONF_LOCAL=/etc/opt/csw/dovecot.conf [ -f $CONF_LOCAL ] && CONF=$CONF_LOCAL base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'` @@ -26,36 +26,32 @@ case "$1" in start) - echo -n "Starting Dovecot" + echo "Starting Dovecot" $DAEMON -c $CONF - echo "." ;; stop) if test $running = yes; then echo "Stopping Dovecot" kill `cat $pidfile` - echo "." else echo "Dovecot is already stopped." fi ;; reload) if test $running = yes; then - echo -n "Reloading Dovecot configuration" + echo "Reloading Dovecot configuration" kill -HUP `cat $pidfile` - echo "." else echo "Dovecot isn't running." fi ;; restart|force-reload) - echo -n "Restarting Dovecot" + echo "Restarting Dovecot" if test $running = yes; then kill `cat $pidfile` sleep 1 fi $DAEMON -c $CONF - echo "." ;; *) echo "Usage: /etc/init.d/dovecot {start|stop|reload|restart|force-reload}" >&2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 18 15:39:33 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 18 Mar 2009 14:39:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[3801] csw/mgar/pkg Message-ID: Revision: 3801 http://gar.svn.sourceforge.net/gar/?rev=3801&view=rev Author: valholla Date: 2009-03-18 14:39:32 +0000 (Wed, 18 Mar 2009) Log Message: ----------- initial Checkin Added Paths: ----------- csw/mgar/pkg/xmlrpc_c/ csw/mgar/pkg/xmlrpc_c/Makefile csw/mgar/pkg/xmlrpc_c/branches/ csw/mgar/pkg/xmlrpc_c/tags/ csw/mgar/pkg/xmlrpc_c/trunk/ csw/mgar/pkg/xmlrpc_c/trunk/Makefile csw/mgar/pkg/xmlrpc_c/trunk/checksums csw/mgar/pkg/xmlrpc_c/trunk/files/ Added: csw/mgar/pkg/xmlrpc_c/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/Makefile (rev 0) +++ csw/mgar/pkg/xmlrpc_c/Makefile 2009-03-18 14:39:32 UTC (rev 3801) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-18 14:39:32 UTC (rev 3801) @@ -0,0 +1,55 @@ +GARNAME = gd +GARVERSION = 2.0.35 +CATEGORIES = lib + +DESCRIPTION = A library used for dynamic image creation +define BLURB + GD is an open source code library for the dynamic creation of + images by programmers. GD creates PNG, JPEG and GIF images, + among other formats. GD is commonly used to generate charts, + graphics, thumbnails, and most anything else, on the fly. + While not restricted to use on the web, the most common + applications of GD involve web site development. +endef + +MASTER_SITES = http://www.libgd.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += fixme.sh + +PACKAGES = CSWgd +CATALOGNAME_CSWgd = gd +SPKG_DESC_CSWgd = $(DESCRIPTION) + +PATCHFILES = Makefile.diff + +REQUIRED_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv +REQUIRED_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 +NO_ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) +CONFIGURE_ARGS += --with-png=$(prefix) +CONFIGURE_ARGS += --with-freetype=$(prefix) +CONFIGURE_ARGS += --with-fontconfig=$(prefix) +CONFIGURE_ARGS += --with-jpeg=$(prefix) +CONFIGURE_ARGS += --with-xpm=$(prefix) +CONFIGURE_ARGS += --disable-fast-install + +post-configure-modulated: + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) + +## There are no tests for this +TEST_SCRIPTS = skip + +test-skip: + $(DONADA) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 18 15:54:23 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 18 Mar 2009 14:54:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[3802] csw/mgar/pkg/xmlrpc_c/trunk Message-ID: Revision: 3802 http://gar.svn.sourceforge.net/gar/?rev=3802&view=rev Author: valholla Date: 2009-03-18 14:54:23 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Makefile and gar v2 propset Modified Paths: -------------- csw/mgar/pkg/xmlrpc_c/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/xmlrpc_c/trunk/ Property changes on: csw/mgar/pkg/xmlrpc_c/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-18 14:39:32 UTC (rev 3801) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-18 14:54:23 UTC (rev 3802) @@ -1,55 +1,38 @@ -GARNAME = gd -GARVERSION = 2.0.35 +GARNAME = xmlrcp-c +GARVERSION = 1.06.32 CATEGORIES = lib -DESCRIPTION = A library used for dynamic image creation +DESCRIPTION = A lightweight RPC library based on XML and HTTP. define BLURB - GD is an open source code library for the dynamic creation of - images by programmers. GD creates PNG, JPEG and GIF images, - among other formats. GD is commonly used to generate charts, - graphics, thumbnails, and most anything else, on the fly. - While not restricted to use on the web, the most common - applications of GD involve web site development. + It's a spec and a set of implementations that allow software + running on disparate operating systems, running in different + environments to make procedure calls over the Internet. + It's remote procedure calling using HTTP as the transport and + XML as the encoding. XML-RPC is designed to be as simple as possible, + while allowing complex data structures to be transmitted, + processed and returned. endef -MASTER_SITES = http://www.libgd.org/releases/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += fixme.sh +MASTER_SITES = $(SF_MIRRORS) +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=16847 +SPKG_SOURCEURL = http://xmlrpc-c.sourceforge.net +DISTFILES = $(GARNAME)-$(GARVERSION).tgz -PACKAGES = CSWgd -CATALOGNAME_CSWgd = gd +PACKAGES = CSWxmlrpc-c +CATALOGNAME_CSWxmlrpc-c = xmlrpc_c SPKG_DESC_CSWgd = $(DESCRIPTION) -PATCHFILES = Makefile.diff +#PATCHFILES = -REQUIRED_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv -REQUIRED_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib +#REQUIRED_PKGS_CSWxmlrpc-c = # We define upstream file regex so we can be notifed of # new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz -BUILD64 = 1 -NO_ISAEXEC = 1 +#BUILD64 = 1 +#NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) -CONFIGURE_ARGS += --with-png=$(prefix) -CONFIGURE_ARGS += --with-freetype=$(prefix) -CONFIGURE_ARGS += --with-fontconfig=$(prefix) -CONFIGURE_ARGS += --with-jpeg=$(prefix) -CONFIGURE_ARGS += --with-xpm=$(prefix) -CONFIGURE_ARGS += --disable-fast-install -post-configure-modulated: - @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) - -## There are no tests for this -TEST_SCRIPTS = skip - -test-skip: - $(DONADA) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 18 17:00:07 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 18 Mar 2009 16:00:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[3803] csw/mgar/pkg/fixme/trunk/fixme.sh Message-ID: Revision: 3803 http://gar.svn.sourceforge.net/gar/?rev=3803&view=rev Author: valholla Date: 2009-03-18 16:00:07 +0000 (Wed, 18 Mar 2009) Log Message: ----------- force new files to be executable Modified Paths: -------------- csw/mgar/pkg/fixme/trunk/fixme.sh Modified: csw/mgar/pkg/fixme/trunk/fixme.sh =================================================================== --- csw/mgar/pkg/fixme/trunk/fixme.sh 2009-03-18 14:54:23 UTC (rev 3802) +++ csw/mgar/pkg/fixme/trunk/fixme.sh 2009-03-18 16:00:07 UTC (rev 3803) @@ -32,6 +32,7 @@ fixpath=$(gecho $file |gsed 's/\//\\\//g') gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new gmv Makefile.new ${mk} + gchmod +x ${mk} done done @@ -39,11 +40,13 @@ for lt in $(gfind ${BASEPATH} -name libtool -print); do gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new gmv ${lt}.new ${lt} + gchmod +x ${lt} done LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) if [ -f ${LTMAIN} ]; then gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Mar 18 17:22:03 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 18 Mar 2009 16:22:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3804] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 3804 http://gar.svn.sourceforge.net/gar/?rev=3804&view=rev Author: j_arndt Date: 2009-03-18 16:22:03 +0000 (Wed, 18 Mar 2009) Log Message: ----------- nrpe: fixed paths, typo, improved start script Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec csw/mgar/pkg/nrpe/trunk/files/cswnrpe Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-18 16:00:07 UTC (rev 3803) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-18 16:22:03 UTC (rev 3804) @@ -2,7 +2,9 @@ GARVERSION = 2.12 CATEGORIES = apps -DESCRIPTION = NRPE for Nagios +SPKG_DESC_CSWnrpe = nagios remote plugin executor (server files, client package is nrpeplugin) +SPKG_DESC_CSWnrpeplugin = nagios remote plugin executor (client files, server package is nrpe) + define BLURB NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. endef @@ -17,22 +19,22 @@ REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES_CSWnrpe = none cswinitsmf CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include CONFIGURE_ARGS += --with-ssl-dir=/opt/csw/bin CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include -CONFIGURE_ARGS += --prefix=/opt/csw/nagios -CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios +CONFIGURE_ARGS += --prefix=/opt/csw +CONFIGURE_ARGS += --exec-prefix=/opt/csw PATCHFILES = patch.diff # Removal of LOG_AUTHPRIV and LOG_FTP # Solaris doesn't have these log facilities PATCHFILES += configure.diff -sysconfdir = $(prefix)/nagios/etc -bindir = $(prefix)/nagios/bin +sysconfdir = $(prefix)/etc +bindir = $(prefix)/bin libexecdir = $(prefix)/libexec/nagios-plugins datadir = $(prefix)/share @@ -58,7 +60,7 @@ ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR) ginstall -m 775 -d $(DESTDIR)$(CFGDIR) - ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR) + ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg-sample ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe @$(MAKECOOKIE) Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-03-18 16:00:07 UTC (rev 3803) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-03-18 16:22:03 UTC (rev 3804) @@ -1,11 +1,11 @@ b2d75e2962f1e3151ef58794d60c9e97 download/nrpe-2.12.tar.gz -92411c5c2fd596a0e1b5fd77f97bff4b download/CSWnrpe.gspec -4dd4b521ecafb3742bdbbdd7d6e84403 download/CSWnrpe.prototype +1c656040abd280f9228b42df744d93eb download/CSWnrpe.gspec +11953efe2c65e3efb7c39342185a96ba download/CSWnrpe.prototype bda68135e2b65da40c3d2b68a3b8dc78 download/CSWnrpe.checkinstall 53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall 393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove -708c90700a7e1d79fe06e94a78fc1eea download/cswnrpe -54aebe8f3d7bc8d2ec5ea1954d859b10 download/CSWnrpeplugin.gspec +cbfc86ba77e78e2f860f90a303a1abe5 download/cswnrpe +5eaf5f95a021fc9bf55ac80c87fcb243 download/CSWnrpeplugin.gspec e22a7817c7665e79bcbad7e091375be9 download/CSWnrpeplugin.prototype 5b02d4385daaea2a8c13903539aa6189 download/patch.diff 4b51476c782d2c5764d10f8ed530ada0 download/configure.diff Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec 2009-03-18 16:00:07 UTC (rev 3803) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec 2009-03-18 16:22:03 UTC (rev 3804) @@ -1,4 +1,3 @@ %var bitname nrpe %var pkgname CSWnrpe %include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/LICENSE Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-03-18 16:00:07 UTC (rev 3803) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-03-18 16:22:03 UTC (rev 3804) @@ -1,7 +1,7 @@ -d none /opt/csw/nagios/bin 0755 nagios nagios -f none /opt/csw/nagios/bin/nrpe 0775 nagios nagios -d none /opt/csw/nagios/etc 0755 nagios nagios -f none /opt/csw/nagios/etc/nrpe.cfg 0644 nagios nagios +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/nrpe 0775 root bin +d none /opt/csw/etc 0755 root bin +f none /opt/csw/etc/nrpe.cfg-sample 0644 root bin d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec 2009-03-18 16:00:07 UTC (rev 3803) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec 2009-03-18 16:22:03 UTC (rev 3804) @@ -1,4 +1,3 @@ %var bitname nrpeplugin %var pkgname CSWnrpeplugin %include url file://%{PKGLIB}/csw_dyndepend.gspec -#%copyright url file://%{WORKSRC}/LICENSE Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-03-18 16:00:07 UTC (rev 3803) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-03-18 16:22:03 UTC (rev 3804) @@ -11,10 +11,23 @@ #FMRI application # FMRI path for service +SMF_EXIT_ERR_CONFIG=1 + +if [ -f /lib/svc/share/smf_include.sh ] +then + . /lib/svc/share/smf_include.sh +fi + CONFIG_FILE=/etc/opt/csw/nrpe.cfg if [ ! -f $CONFIG_FILE ] ; then CONFIG_FILE=/opt/csw/nagios/etc/nrpe.cfg fi + +if [ ! -f $CONFIG_FILE ] +then + exit $SMF_EXIT_ERR_CONFIG +fi + BIN_FILE="/opt/csw/nagios/bin/nrpe" pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` NRPE_USER=`awk -F'=' '/nrpe_user/ { print $NF }' $CONFIG_FILE` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Mar 18 17:23:31 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 18 Mar 2009 16:23:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3805] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 3805 http://gar.svn.sourceforge.net/gar/?rev=3805&view=rev Author: j_arndt Date: 2009-03-18 16:23:31 +0000 (Wed, 18 Mar 2009) Log Message: ----------- nsca: fixed paths, improved start script Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype csw/mgar/pkg/nsca/trunk/files/cswnsca Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-18 16:22:03 UTC (rev 3804) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-18 16:23:31 UTC (rev 3805) @@ -2,7 +2,9 @@ GARVERSION = 2.7.2 CATEGORIES = apps -DESCRIPTION = passive checks for nagios +SPKG_DESC_CSWnsca = Nagios service check acceptor - nagios server files only (the client package is send_nsca) +SPKG_DESC_CSWsendnsca = Nagios service check acceptor - send passive check results to nagios server (client files only) + define BLURB NSCA allows you to integrate passive alerts and checks from remote machines and applications with Nagios. Useful for processing security alerts, as well as redundant and distributed Nagios setups. endef @@ -18,11 +20,11 @@ REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES_CSWnsca = none cswinitsmf CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 -CONFIGURE_ARGS += --localstatedir=/opt/csw/nagios/var +CONFIGURE_ARGS += --localstatedir=/opt/csw/var BUILD_TARGETS = nsca @@ -30,25 +32,29 @@ include gar/category.mk +BINDIR=$(prefix)/bin NAGIOSBINDIR=$(prefix)/nagios/bin +CFGDIR=$(prefix)/etc NAGIOSCFGDIR=$(prefix)/nagios/etc NSCADOCDIR=$(prefix)/share/doc/nsca SENDNSCADOCDIR=$(prefix)/share/doc/send_nsca post-install-modulated: - ginstall -d $(DESTDIR)$(prefix)/nagios/bin - ginstall -d $(DESTDIR)$(prefix)/nagios/etc + ginstall -d $(DESTDIR)$(prefix)/bin + ginstall -d $(DESTDIR)$(prefix)/etc + ginstall -d $(DESTDIR)$(NAGIOSBINDIR) + ginstall -d $(DESTDIR)$(NAGIOSCFGDIR) ginstall -m 755 -d $(DESTDIR)$(NSCADOCDIR) ginstall -m 755 $(WORKSRC)/src/nsca $(DESTDIR)$(NAGIOSBINDIR) - ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg + ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg-sample ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(NSCADOCDIR) - ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(NAGIOSBINDIR) + ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR) ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) - ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/send_nsca.cfg + ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg-sample ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR) Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2009-03-18 16:22:03 UTC (rev 3804) +++ csw/mgar/pkg/nsca/trunk/checksums 2009-03-18 16:23:31 UTC (rev 3805) @@ -1,10 +1,10 @@ 33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz 82f1144c12dc6247524609dbeefc3023 download/CSWnsca.gspec -22cc4e3984d0627708f954c39fa6a22a download/CSWnsca.prototype +8dfc4283d41a0c127a00170ab285c18d download/CSWnsca.prototype 1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall 7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall -b82767ed7ab002fea4b3a4395511c93c download/CSWsendnsca.gspec -49309205ad3d77c99f9bd469cc3860d2 download/CSWsendnsca.prototype +0f458cf358b1aab192c02fd0d37b1220 download/CSWsendnsca.gspec +67d4566b83bad9e981bae7e889217c85 download/CSWsendnsca.prototype 8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall -e2ea854aa2df24d432ba37ae614f9fa4 download/cswnsca +55a1c5523b2fe1ee66b45a2807e80bd6 download/cswnsca 08b769c5511342dd03fa01fea44cb260 download/submit_check_results.diff Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-18 16:22:03 UTC (rev 3804) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-18 16:23:31 UTC (rev 3805) @@ -1,7 +1,7 @@ 1 d none /opt/csw/nagios/bin 0755 nagios nagios 1 f none /opt/csw/nagios/bin/nsca 0755 nagios nagios -1 d none /opt/csw/nagios/etc 0755 nagios -1 f none /opt/csw/nagios/etc/nsca.cfg 0600 nagios nagios +1 d none /opt/csw/nagios/etc 0755 nagios nagios +1 f none /opt/csw/nagios/etc/nsca.cfg-sample 0600 nagios nagios 1 d none /opt/csw/share/doc/nsca 0755 root bin 1 f none /opt/csw/share/doc/nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/nsca/LEGAL 0644 root bin Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec 2009-03-18 16:22:03 UTC (rev 3804) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec 2009-03-18 16:23:31 UTC (rev 3805) @@ -1,3 +1,3 @@ -%var bitname sendnsca +%var bitname send_nsca %var pkgname CSWsendnsca %include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-03-18 16:22:03 UTC (rev 3804) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-03-18 16:23:31 UTC (rev 3805) @@ -1,7 +1,7 @@ -1 d none /opt/csw/nagios/bin 0755 nagios nagios -1 f none /opt/csw/nagios/bin/send_nsca 0755 nagios nagios -1 d none /opt/csw/nagios/etc 0755 nagios nagios -1 f none /opt/csw/nagios/etc/send_nsca.cfg 0644 nagios nagios +1 d none /opt/csw/bin 0755 root bin +1 f none /opt/csw/bin/send_nsca 0755 root bin +1 d none /opt/csw/etc 0755 root bin +1 f none /opt/csw/etc/send_nsca.cfg-sample 0644 root bin 1 d none /opt/csw/share/doc/send_nsca 0755 root bin 1 f none /opt/csw/share/doc/send_nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/send_nsca/LEGAL 0644 root bin Modified: csw/mgar/pkg/nsca/trunk/files/cswnsca =================================================================== --- csw/mgar/pkg/nsca/trunk/files/cswnsca 2009-03-18 16:22:03 UTC (rev 3804) +++ csw/mgar/pkg/nsca/trunk/files/cswnsca 2009-03-18 16:23:31 UTC (rev 3805) @@ -10,6 +10,19 @@ #FMRI application # FMRI path for service CONFIG_FILE=/opt/csw/nagios/etc/nsca.cfg + +SMF_EXIT_ERR_CONFIG=1 + +if [ -f /lib/svc/share/smf_include.sh ] +then + . /lib/svc/share/smf_include.sh +fi + +if [ ! -f $CONFIG_FILE ] +then + exit $SMF_EXIT_ERR_CONFIG +fi + BIN_FILE="/opt/csw/nagios/bin/nsca" pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` nsca_USER=`awk -F'=' '/nsca_user/ { print $NF }' $CONFIG_FILE` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 18 18:54:19 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 18 Mar 2009 17:54:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[3806] csw/mgar/pkg Message-ID: Revision: 3806 http://gar.svn.sourceforge.net/gar/?rev=3806&view=rev Author: valholla Date: 2009-03-18 17:54:11 +0000 (Wed, 18 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/libwww/ csw/mgar/pkg/libwww/Makefile csw/mgar/pkg/libwww/branches/ csw/mgar/pkg/libwww/tags/ csw/mgar/pkg/libwww/trunk/ csw/mgar/pkg/libwww/trunk/Makefile csw/mgar/pkg/libwww/trunk/checksums csw/mgar/pkg/libwww/trunk/files/ Added: csw/mgar/pkg/libwww/Makefile =================================================================== --- csw/mgar/pkg/libwww/Makefile (rev 0) +++ csw/mgar/pkg/libwww/Makefile 2009-03-18 17:54:11 UTC (rev 3806) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libwww/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwww/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libwww/trunk/Makefile 2009-03-18 17:54:11 UTC (rev 3806) @@ -0,0 +1,35 @@ +GARNAME = w3c-libwww +GARVERSION = 5.4.0 +CATEGORIES = lib + +DESCRIPTION = A library used for dynamic image creation +define BLURB + GD is an open source code library for the dynamic creation of + images by programmers. GD creates PNG, JPEG and GIF images, + among other formats. GD is commonly used to generate charts, + graphics, thumbnails, and most anything else, on the fly. + While not restricted to use on the web, the most common + applications of GD involve web site development. +endef + +MASTER_SITES = http://www.w3.org/Library/Distribution +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +PACKAGES = CSWlibwww +CATALOGNAME_CSWlibwww = w3c_libwww +SPKG_DESC_CSWgd = $(DESCRIPTION) + +#PATCHFILES = + +#REQUIRED_PKGS_CSWlibwww = + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +#BUILD64 = 1 +#NO_ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Mar 18 19:00:47 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 18 Mar 2009 18:00:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[3807] csw/mgar/pkg/hatari/trunk/Makefile Message-ID: Revision: 3807 http://gar.svn.sourceforge.net/gar/?rev=3807&view=rev Author: jake_goerzen Date: 2009-03-18 18:00:44 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Fix UFILES_REGEX tar.gz -> tar.bz2; Add runtime flags to LD_OPTIONS Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2009-03-18 17:54:11 UTC (rev 3806) +++ csw/mgar/pkg/hatari/trunk/Makefile 2009-03-18 18:00:44 UTC (rev 3807) @@ -11,17 +11,12 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWhatari, depend ) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - LICENSE = gpl.txt PATCHFILES = stdint.h.diff GARCOMPILER = GNU TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket' -BUILD_ARGS = LD_OPTIONS=-L/opt/csw/lib - +BUILD_ARGS = LD_OPTIONS='-R/opt/csw/lib/$ISALIST -R/opt/csw/lib -L/opt/csw/lib' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Mar 18 19:19:53 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 18 Mar 2009 18:19:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[3808] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 3808 http://gar.svn.sourceforge.net/gar/?rev=3808&view=rev Author: skayser Date: 2009-03-18 18:19:53 +0000 (Wed, 18 Mar 2009) Log Message: ----------- dovecot: added patch for ENOSYS on autofs mounts Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dovecot/trunk/files/patch-enosys.diff csw/mgar/pkg/dovecot/trunk/files/patch-exampleconf.diff Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-18 18:00:44 UTC (rev 3807) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-18 18:19:53 UTC (rev 3808) @@ -50,8 +50,10 @@ # See http://dovecot.org/list/dovecot/2009-February/037273.html PATCHFILES = patch-authcrash.diff +# See http://dovecot.org/list/dovecot/2009-March/038201.html +PATCHFILES += patch-enosys.diff # Adjust the comment about file paths in the example conf header -PATCHFILES = patch-exampleconf.diff +PATCHFILES += patch-exampleconf.diff # Override some paths for configure localstatedir=/var/opt/csw Added: csw/mgar/pkg/dovecot/trunk/files/patch-enosys.diff =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/patch-enosys.diff (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/patch-enosys.diff 2009-03-18 18:19:53 UTC (rev 3808) @@ -0,0 +1,12 @@ +--- a/src/lib/mkdir-parents.c Wed Mar 18 13:47:58 2009 -0400 ++++ b/src/lib/mkdir-parents.c Wed Mar 18 14:10:08 2009 -0400 +@@ -18,7 +18,7 @@ int mkdir_parents(const char *path, mode + + ENOSYS check is for NFS mount points. + */ +- if (errno == EISDIR && errno == ENOSYS) ++ if (errno == EISDIR || errno == ENOSYS) + errno = EEXIST; + return -1; + } else { + Added: csw/mgar/pkg/dovecot/trunk/files/patch-exampleconf.diff =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/patch-exampleconf.diff (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/patch-exampleconf.diff 2009-03-18 18:19:53 UTC (rev 3808) @@ -0,0 +1,16 @@ +diff --speed-large-files --minimal -Nru dovecot-1.1.11.orig/dovecot-example.conf dovecot-1.1.11/dovecot-example.conf +--- dovecot-1.1.11.orig/dovecot-example.conf 2009-01-26 02:12:41.000000000 +0100 ++++ dovecot-1.1.11/dovecot-example.conf 2009-03-18 00:26:59.345199088 +0100 +@@ -10,10 +10,8 @@ + # value inside quotes, eg.: key = "# char and trailing whitespace " + + # Default values are shown for each setting, it's not required to uncomment +-# any of the lines. Exception to this are paths, they're just examples with +-# the real defaults being based on configure options. The paths listed here +-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +-# --with-ssldir=/etc/ssl ++# any of the lines. The paths have been modified to reflect the OpenCSW ++# file system layout. + + # Base directory where to store runtime data. + #base_dir = /var/run/dovecot/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 18 20:18:26 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 18 Mar 2009 19:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[3809] csw/mgar/pkg/libwww/trunk Message-ID: Revision: 3809 http://gar.svn.sourceforge.net/gar/?rev=3809&view=rev Author: valholla Date: 2009-03-18 19:18:26 +0000 (Wed, 18 Mar 2009) Log Message: ----------- propset gar v2 Modified Paths: -------------- csw/mgar/pkg/libwww/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libwww/trunk/ Property changes on: csw/mgar/pkg/libwww/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libwww/trunk/checksums =================================================================== --- csw/mgar/pkg/libwww/trunk/checksums 2009-03-18 18:19:53 UTC (rev 3808) +++ csw/mgar/pkg/libwww/trunk/checksums 2009-03-18 19:18:26 UTC (rev 3809) @@ -0,0 +1 @@ +c3734ca6caa405707e134cc8c6d7e422 download/w3c-libwww-5.4.0.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Mar 18 23:21:15 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 18 Mar 2009 22:21:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[3810] csw/mgar/pkg/xmlrpc_c/trunk Message-ID: Revision: 3810 http://gar.svn.sourceforge.net/gar/?rev=3810&view=rev Author: valholla Date: 2009-03-18 22:21:09 +0000 (Wed, 18 Mar 2009) Log Message: ----------- working copy, tests still fail Modified Paths: -------------- csw/mgar/pkg/xmlrpc_c/trunk/Makefile csw/mgar/pkg/xmlrpc_c/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff Modified: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-18 19:18:26 UTC (rev 3809) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-18 22:21:09 UTC (rev 3810) @@ -1,4 +1,4 @@ -GARNAME = xmlrcp-c +GARNAME = xmlrpc-c GARVERSION = 1.06.32 CATEGORIES = lib @@ -20,9 +20,9 @@ PACKAGES = CSWxmlrpc-c CATALOGNAME_CSWxmlrpc-c = xmlrpc_c -SPKG_DESC_CSWgd = $(DESCRIPTION) +SPKG_DESC_CSWxmlrpc-c = $(DESCRIPTION) -#PATCHFILES = +PATCHFILES = makefix.diff #REQUIRED_PKGS_CSWxmlrpc-c = @@ -33,6 +33,11 @@ #BUILD64 = 1 #NO_ISAEXEC = 1 +TEST_TARGET = check + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-libxml2-backend include gar/category.mk + + Modified: csw/mgar/pkg/xmlrpc_c/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/checksums 2009-03-18 19:18:26 UTC (rev 3809) +++ csw/mgar/pkg/xmlrpc_c/trunk/checksums 2009-03-18 22:21:09 UTC (rev 3810) @@ -0,0 +1,2 @@ +1a5a0771a22e75819d90e7fab38ef377 download/xmlrpc-c-1.06.32.tgz +bbad2fdf6721f423985b9964b38ac17c download/makefix.diff Added: csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff (rev 0) +++ csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff 2009-03-18 22:21:09 UTC (rev 3810) @@ -0,0 +1,33 @@ +--- xmlrpc-c-1.06.32/src/Makefile.o 2009-03-18 15:28:27.199486556 -0500 ++++ xmlrpc-c-1.06.32/src/Makefile 2009-03-18 15:29:11.545130838 -0500 +@@ -145,7 +145,7 @@ + libxmlrpc_client.la: $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS) + $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \ + $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS) \ +- $(LIBXMLRPC_CLIENT_LIBDEP) $(TRANSPORT_LIBDEP) \ ++ $(LIBXMLRPC_CLIENT_LIBDEP) $(TRANSPORT_LIBDEP) + + libxmlrpc_server.la: $(LIBXMLRPC_SERVER_OBJS) + $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \ +--- xmlrpc-c-1.06.32/tools/xml-rpc-api2cpp/Makefile.o 2009-03-18 16:33:30.751515171 -0500 ++++ xmlrpc-c-1.06.32/tools/xml-rpc-api2cpp/Makefile 2009-03-18 16:33:01.993010353 -0500 +@@ -19,7 +19,7 @@ + + LDFLAGS = $(LADD) + +-LDLIBS = -Lblddir/src/cpp -lxmlrpc_cpp -lxmlrpc_server $(CLIENT_LDLIBS) ++LDLIBS = -Lblddir/src/cpp -lxmlrpc_cpp -Lblddir/src/.libs -lxmlrpc_server $(CLIENT_LDLIBS) + + PROGS := + +--- xmlrpc-c-1.06.32/GNUmakefile.o 2009-03-18 17:17:49.128184463 -0500 ++++ xmlrpc-c-1.06.32/GNUmakefile 2009-03-18 17:18:32.527139668 -0500 +@@ -7,7 +7,7 @@ + + include $(SRCDIR)/Makefile.config + +-SUBDIRS = include lib src tools examples ++SUBDIRS = include lib src tools + + PROGRAMS_TO_INSTALL = xmlrpc-c-config + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Mar 19 03:57:01 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 19 Mar 2009 02:57:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[3811] csw/mgar/pkg Message-ID: Revision: 3811 http://gar.svn.sourceforge.net/gar/?rev=3811&view=rev Author: valholla Date: 2009-03-19 02:57:01 +0000 (Thu, 19 Mar 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/libssh2/ csw/mgar/pkg/libssh2/branches/ csw/mgar/pkg/libssh2/tags/ csw/mgar/pkg/libssh2/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Mar 19 03:58:02 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 19 Mar 2009 02:58:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[3812] csw/mgar/pkg/libssh2/trunk/ Message-ID: Revision: 3812 http://gar.svn.sourceforge.net/gar/?rev=3812&view=rev Author: valholla Date: 2009-03-19 02:58:02 +0000 (Thu, 19 Mar 2009) Log Message: ----------- propset to garv2 Property Changed: ---------------- csw/mgar/pkg/libssh2/trunk/ Property changes on: csw/mgar/pkg/libssh2/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 19 04:23:33 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 19 Mar 2009 03:23:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[3813] csw/mgar/pkg Message-ID: Revision: 3813 http://gar.svn.sourceforge.net/gar/?rev=3813&view=rev Author: hson Date: 2009-03-19 03:23:32 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Add intermediate level Makefiles Added Paths: ----------- csw/mgar/pkg/dsniff/Makefile csw/mgar/pkg/exiftool/Makefile csw/mgar/pkg/facter/Makefile csw/mgar/pkg/gengetopt/Makefile csw/mgar/pkg/gnumeric/Makefile csw/mgar/pkg/gtk-doc/Makefile csw/mgar/pkg/htmldoc/Makefile csw/mgar/pkg/ilmbase/Makefile csw/mgar/pkg/lcms/Makefile csw/mgar/pkg/libexif/Makefile csw/mgar/pkg/libgc/Makefile csw/mgar/pkg/libgoffice/Makefile csw/mgar/pkg/libgsf/Makefile csw/mgar/pkg/libiptcdata/Makefile csw/mgar/pkg/libnet/Makefile csw/mgar/pkg/libnids/Makefile csw/mgar/pkg/librsvg/Makefile csw/mgar/pkg/netsnmp/Makefile csw/mgar/pkg/puppet/Makefile csw/mgar/pkg/pwgen/Makefile csw/mgar/pkg/w3m/Makefile csw/mgar/pkg/wmf/Makefile Added: csw/mgar/pkg/dsniff/Makefile =================================================================== --- csw/mgar/pkg/dsniff/Makefile (rev 0) +++ csw/mgar/pkg/dsniff/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/exiftool/Makefile =================================================================== --- csw/mgar/pkg/exiftool/Makefile (rev 0) +++ csw/mgar/pkg/exiftool/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/facter/Makefile =================================================================== --- csw/mgar/pkg/facter/Makefile (rev 0) +++ csw/mgar/pkg/facter/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/gengetopt/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/Makefile (rev 0) +++ csw/mgar/pkg/gengetopt/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/gnumeric/Makefile =================================================================== --- csw/mgar/pkg/gnumeric/Makefile (rev 0) +++ csw/mgar/pkg/gnumeric/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/gtk-doc/Makefile =================================================================== --- csw/mgar/pkg/gtk-doc/Makefile (rev 0) +++ csw/mgar/pkg/gtk-doc/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/htmldoc/Makefile =================================================================== --- csw/mgar/pkg/htmldoc/Makefile (rev 0) +++ csw/mgar/pkg/htmldoc/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/ilmbase/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/Makefile (rev 0) +++ csw/mgar/pkg/ilmbase/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/lcms/Makefile =================================================================== --- csw/mgar/pkg/lcms/Makefile (rev 0) +++ csw/mgar/pkg/lcms/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libexif/Makefile =================================================================== --- csw/mgar/pkg/libexif/Makefile (rev 0) +++ csw/mgar/pkg/libexif/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libgc/Makefile =================================================================== --- csw/mgar/pkg/libgc/Makefile (rev 0) +++ csw/mgar/pkg/libgc/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libgoffice/Makefile =================================================================== --- csw/mgar/pkg/libgoffice/Makefile (rev 0) +++ csw/mgar/pkg/libgoffice/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libgsf/Makefile =================================================================== --- csw/mgar/pkg/libgsf/Makefile (rev 0) +++ csw/mgar/pkg/libgsf/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libiptcdata/Makefile =================================================================== --- csw/mgar/pkg/libiptcdata/Makefile (rev 0) +++ csw/mgar/pkg/libiptcdata/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libnet/Makefile =================================================================== --- csw/mgar/pkg/libnet/Makefile (rev 0) +++ csw/mgar/pkg/libnet/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libnids/Makefile =================================================================== --- csw/mgar/pkg/libnids/Makefile (rev 0) +++ csw/mgar/pkg/libnids/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/librsvg/Makefile =================================================================== --- csw/mgar/pkg/librsvg/Makefile (rev 0) +++ csw/mgar/pkg/librsvg/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/netsnmp/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/Makefile (rev 0) +++ csw/mgar/pkg/netsnmp/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/puppet/Makefile =================================================================== --- csw/mgar/pkg/puppet/Makefile (rev 0) +++ csw/mgar/pkg/puppet/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/pwgen/Makefile =================================================================== --- csw/mgar/pkg/pwgen/Makefile (rev 0) +++ csw/mgar/pkg/pwgen/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/w3m/Makefile =================================================================== --- csw/mgar/pkg/w3m/Makefile (rev 0) +++ csw/mgar/pkg/w3m/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/wmf/Makefile =================================================================== --- csw/mgar/pkg/wmf/Makefile (rev 0) +++ csw/mgar/pkg/wmf/Makefile 2009-03-19 03:23:32 UTC (rev 3813) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Mar 19 10:48:51 2009 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 19 Mar 2009 10:48:51 +0100 Subject: [csw-devel] SF.net SVN: gar:[3797] csw/mgar/gar/v2/categories/x11/category.mk In-Reply-To: References: Message-ID: <5C04A9C8-401A-4E5F-94F7-CCF10361548B@opencsw.org> Hi, Am 18.03.2009 um 09:57 schrieb Maciej Blizi?ski: > On Tue, Mar 17, 2009 at 11:44 PM, > wrote: >> +ifeq ($(GARCOMPILER),GNU) > > Can GARCOMPILER be tested for GCC3 and GCC4 as well? I recommend something like EXTRA_CFLAGS_GCC3 = ... EXTRA_CFLAGS_SOS11 = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION EXTRA_CFLAGS_SOS12 = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION EXTRA_CXXFLAGS_SOS11 = -xlibmil -xlibmopt -features=tmplife -norunpath ... CFLAGS += $(EXTRA_CFLAGS_$(GARCOMPILER) CXXFLAGS += $(EXTRA_CXXFLAGS_$(GARCOMPILER) There is no GARCOMPILER 'SUN' or 'GCC', see the top of gar.conf.mk: > GARCOMPILER ?= SUN > > # We have parameters for the following compilers > GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 > > ifeq ($(GARCOMPILER),SUN) > GARCOMPILER = SOS11 > endif > > ifeq ($(GARCOMPILER),GNU) > GARCOMPILER = GCC4 > endif > > ifeq (,$(filter $(GARCOMPILER),$(GARCOMPILERS))) > $(error The compiler '$(GARCOMPILER)' is unknown. Please select > one of $(GARCOMPILERS)) > endif Best regards -- Dago From bonivart at users.sourceforge.net Thu Mar 19 14:18:45 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 19 Mar 2009 13:18:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3814] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 3814 http://gar.svn.sourceforge.net/gar/?rev=3814&view=rev Author: bonivart Date: 2009-03-19 13:18:45 +0000 (Thu, 19 Mar 2009) Log Message: ----------- pkgutil: update to 1.5b3 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-03-19 03:23:32 UTC (rev 3813) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-03-19 13:18:45 UTC (rev 3814) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.5b2 +GARVERSION = 1.5b3 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -10,7 +10,6 @@ package automatically. endef -#MASTER_SITES = http://www.bonivart.com/pkgutil/ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) @@ -40,16 +39,16 @@ # @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages @ginstall -d $(DESTDIR)/etc/opt/csw - @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW - @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW - @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) - @cp -r $(WORKSRC)/bldcat $(DESTDIR)$(bindir) - @cp -r $(WORKSRC)/chkcat $(DESTDIR)$(bindir) - @cp -r $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ - @cp -r $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)/ -# @cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil -# @cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil - @cp -r $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW - @cp -r $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget + @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) + @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) + @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)/ +# @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil +# @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil + @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW + @cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-03-19 03:23:32 UTC (rev 3813) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-03-19 13:18:45 UTC (rev 3814) @@ -1,4 +1,4 @@ -1b273bbe099ff9fff53effeda50d3af7 download/pkgutil-1.5b2.zip +6a6207bf65dac0135ffbcdc380341525 download/pkgutil-1.5b3.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec 54bd1af1cd6ca5ac7e63586ffc16842d download/CSWpkgutil.prototype e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Mar 19 14:32:21 2009 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 19 Mar 2009 14:32:21 +0100 Subject: [csw-devel] Orca and friends packages In-Reply-To: <49BFE579.CC54.005D.3@emporia.edu> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> <49BFE579.CC54.005D.3@emporia.edu> Message-ID: <91D22A54-32E7-40FF-A6D1-BE3252D91D92@opencsw.org> Hi Glen, Am 18.03.2009 um 00:01 schrieb Glen Gunselman: > I know a little about using Orca but very little about installing it. > > I will have an LDom on a T5220 to test on running Solaris 10 5/08. > > If you could provide some "how-to" that would really help. I'll be writing this in the next few days at http://wiki.opencsw.org/orca-package Please be advised that it is not ready yet and CSWorca is not yet released. Best regards -- Dago -------------- next part -------------- An HTML attachment was scrubbed... URL: From skayser at users.sourceforge.net Thu Mar 19 14:32:58 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 19 Mar 2009 13:32:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3815] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 3815 http://gar.svn.sourceforge.net/gar/?rev=3815&view=rev Author: skayser Date: 2009-03-19 13:32:58 +0000 (Thu, 19 Mar 2009) Log Message: ----------- dovecot: added ulimit -n to init script, updated changelog/README Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-19 13:18:45 UTC (rev 3814) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-19 13:32:58 UTC (rev 3815) @@ -87,17 +87,17 @@ include gar/category.mk -# Adjust file paths in various files. Not a prerequisite to the remaining build -# process, but i found it easiest # to put it here and not clutter post-install -# even more +# Adjust file paths in various files. Not a prerequisite to the remaining +# build process, but i found it easiest to put it here and not clutter +# post-install even more pre-install-modulated: @perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh @perl -pi -e '\ s| /var/run| /var/opt/csw/run|; \ s| /etc/ssl| /opt/csw/ssl|; \ s| /usr/libexec| /opt/csw/libexec|; \ - s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \ - ' $(WORKSRC)/dovecot-example.conf + s| /usr/lib/dovecot| /opt/csw/lib/dovecot|;' \ + $(WORKSRC)/dovecot-example.conf @$(MAKECOOKIE) # Maybe there is a nicer way to build this via modulations ... Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2009-03-19 13:18:45 UTC (rev 3814) +++ csw/mgar/pkg/dovecot/trunk/checksums 2009-03-19 13:32:58 UTC (rev 3815) @@ -1,2 +1,4 @@ c973eb41aca79fb16630a16f0d84f765 download/dovecot-1.1.11.tar.gz +1f39cae3a38d10169fe31f246095b67f download/patch-authcrash.diff +b6bdbd7b8e6f513a8f19dbc0a7507aa6 download/patch-enosys.diff 765a31bece26ed3cebee784dc4aa8216 download/patch-exampleconf.diff Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-03-19 13:18:45 UTC (rev 3814) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-03-19 13:32:58 UTC (rev 3815) @@ -1,17 +1,56 @@ -Service user accounts -===================== -The CSWdovecot package will create a service user account (dovecot) for you in -case no user account by this name exists upon installation. This user account -is required for the dovecot login service (and nothing else). +Configuration file +------------------ +The default configuration path is /opt/csw/etc/dovecot.conf. CSWdovecot +brings with it a sample configuration (suffixed with .CSW) that will be +installed when dovecot.conf doesn't exist yet. This sample configuration +provides IMAP/POP3 and IMAPS/POP3S services to system users and uses a +self-signed certificate that comes with the package. + +When you adjust dovecot.conf, package upgrades will preserve your +configuration and just install the sample configuration as dovecot.conf.CSW. + + +Machine-local configuration in shared /opt setups +------------------------------------------------- + +If you share /opt among several machines (via NFS for example) you can use +/etc/opt/csw/dovecot.conf as machine-local configuration. The dovecot +startup script will then use it instead of the default configuration. + + +User accounts +------------- + +On installation CSWdovecot will create a user named dovecot in case no user +account by this name exists. This user account is required for the Dovecot +login service (and nothing else). + If you want to use Dovecot for virtual users, you need to create another -service user account (!= dovecot). For background information, see +user account (!= dovecot). For background information, see http://wiki.dovecot.org/UserIds + Upgrading -========= +--------- + For upgrading information from other IMAP servers or previous Dovecot versions, see http://wiki.dovecot.org/UpgradingDovecot + + +Sieve plugin +------------ + +Sieve support (via the cmusieve plugin) is contained in the CSWdovecot_sieve +package. If required install this package and add + + mail_plugins = cmusieve + +to the "protocol lda" section in dovecot.conf. This requires that you use +Dovecot's deliver as LDA of course. See the following URLs for details + + http://wiki.dovecot.org/LDA + http://wiki.dovecot.org/LDA/Sieve#CMUSieve_Plugin Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-03-19 13:18:45 UTC (rev 3814) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-03-19 13:32:58 UTC (rev 3815) @@ -1,7 +1,9 @@ -dovecot (1.1.11) REV=2009.03.15 +dovecot (1.1.11) REV=2009.03.19 * Package adopted again and updated to 1.1.11. * Tested and validated LDAP interopability with PAM. (Closes: #2760) * Adjusted SSLDIR in mkcert.sh. (Closes: #3027) + * Compiled with --localstatedir=/var/opt/csw. Changes base_dir from + /opt/csw/var/run/dovecot to /var/opt/csw/run/dovecot. - -- Sebastian Kayser Sun, 15 Mar 2009 18:19:59 +0100 + -- Sebastian Kayser Thu, 19 Mar 2009 14:02:16 +0100 Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-19 13:18:45 UTC (rev 3814) +++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-19 13:32:58 UTC (rev 3815) @@ -27,6 +27,7 @@ case "$1" in start) echo "Starting Dovecot" + ulimit -n 1024 $DAEMON -c $CONF ;; stop) @@ -51,6 +52,7 @@ kill `cat $pidfile` sleep 1 fi + ulimit -n 1024 $DAEMON -c $CONF ;; *) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Mar 19 15:14:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 19 Mar 2009 14:14:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3816] csw/mgar/pkg/xmlrpc_c/trunk Message-ID: Revision: 3816 http://gar.svn.sourceforge.net/gar/?rev=3816&view=rev Author: valholla Date: 2009-03-19 14:14:25 +0000 (Thu, 19 Mar 2009) Log Message: ----------- remove my files for Roger's working version Removed Paths: ------------- csw/mgar/pkg/xmlrpc_c/trunk/Makefile csw/mgar/pkg/xmlrpc_c/trunk/checksums csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff Deleted: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-19 13:32:58 UTC (rev 3815) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-19 14:14:25 UTC (rev 3816) @@ -1,43 +0,0 @@ -GARNAME = xmlrpc-c -GARVERSION = 1.06.32 -CATEGORIES = lib - -DESCRIPTION = A lightweight RPC library based on XML and HTTP. -define BLURB - It's a spec and a set of implementations that allow software - running on disparate operating systems, running in different - environments to make procedure calls over the Internet. - It's remote procedure calling using HTTP as the transport and - XML as the encoding. XML-RPC is designed to be as simple as possible, - while allowing complex data structures to be transmitted, - processed and returned. -endef - -MASTER_SITES = $(SF_MIRRORS) -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=16847 -SPKG_SOURCEURL = http://xmlrpc-c.sourceforge.net -DISTFILES = $(GARNAME)-$(GARVERSION).tgz - -PACKAGES = CSWxmlrpc-c -CATALOGNAME_CSWxmlrpc-c = xmlrpc_c -SPKG_DESC_CSWxmlrpc-c = $(DESCRIPTION) - -PATCHFILES = makefix.diff - -#REQUIRED_PKGS_CSWxmlrpc-c = - -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz - -#BUILD64 = 1 -#NO_ISAEXEC = 1 - -TEST_TARGET = check - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-libxml2-backend - -include gar/category.mk - - Deleted: csw/mgar/pkg/xmlrpc_c/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/checksums 2009-03-19 13:32:58 UTC (rev 3815) +++ csw/mgar/pkg/xmlrpc_c/trunk/checksums 2009-03-19 14:14:25 UTC (rev 3816) @@ -1,2 +0,0 @@ -1a5a0771a22e75819d90e7fab38ef377 download/xmlrpc-c-1.06.32.tgz -bbad2fdf6721f423985b9964b38ac17c download/makefix.diff Deleted: csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff 2009-03-19 13:32:58 UTC (rev 3815) +++ csw/mgar/pkg/xmlrpc_c/trunk/files/makefix.diff 2009-03-19 14:14:25 UTC (rev 3816) @@ -1,33 +0,0 @@ ---- xmlrpc-c-1.06.32/src/Makefile.o 2009-03-18 15:28:27.199486556 -0500 -+++ xmlrpc-c-1.06.32/src/Makefile 2009-03-18 15:29:11.545130838 -0500 -@@ -145,7 +145,7 @@ - libxmlrpc_client.la: $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS) - $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \ - $(LIBXMLRPC_CLIENT_OBJS) $(TRANSPORT_OBJS) \ -- $(LIBXMLRPC_CLIENT_LIBDEP) $(TRANSPORT_LIBDEP) \ -+ $(LIBXMLRPC_CLIENT_LIBDEP) $(TRANSPORT_LIBDEP) - - libxmlrpc_server.la: $(LIBXMLRPC_SERVER_OBJS) - $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \ ---- xmlrpc-c-1.06.32/tools/xml-rpc-api2cpp/Makefile.o 2009-03-18 16:33:30.751515171 -0500 -+++ xmlrpc-c-1.06.32/tools/xml-rpc-api2cpp/Makefile 2009-03-18 16:33:01.993010353 -0500 -@@ -19,7 +19,7 @@ - - LDFLAGS = $(LADD) - --LDLIBS = -Lblddir/src/cpp -lxmlrpc_cpp -lxmlrpc_server $(CLIENT_LDLIBS) -+LDLIBS = -Lblddir/src/cpp -lxmlrpc_cpp -Lblddir/src/.libs -lxmlrpc_server $(CLIENT_LDLIBS) - - PROGS := - ---- xmlrpc-c-1.06.32/GNUmakefile.o 2009-03-18 17:17:49.128184463 -0500 -+++ xmlrpc-c-1.06.32/GNUmakefile 2009-03-18 17:18:32.527139668 -0500 -@@ -7,7 +7,7 @@ - - include $(SRCDIR)/Makefile.config - --SUBDIRS = include lib src tools examples -+SUBDIRS = include lib src tools - - PROGRAMS_TO_INSTALL = xmlrpc-c-config - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Mar 19 15:23:19 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 19 Mar 2009 14:23:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[3817] csw/mgar/pkg/socat/trunk Message-ID: Revision: 3817 http://gar.svn.sourceforge.net/gar/?rev=3817&view=rev Author: skayser Date: 2009-03-19 14:23:19 +0000 (Thu, 19 Mar 2009) Log Message: ----------- socat: switched to garv2, bumped version Modified Paths: -------------- csw/mgar/pkg/socat/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/socat/trunk/ Property changes on: csw/mgar/pkg/socat/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2009-03-19 14:14:25 UTC (rev 3816) +++ csw/mgar/pkg/socat/trunk/Makefile 2009-03-19 14:23:19 UTC (rev 3817) @@ -1,36 +1,39 @@ GARNAME = socat -GARVERSION = 1.6.0.1 +GARVERSION = 1.7.0.0 CATEGORIES = net DESCRIPTION = Multipurpose relay for bidirectional data transfer define BLURB - socat is a relay for bidirectional data transfer between two independent data - channels. Each of these data channels may be a file, pipe, device (serial line - etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, UDP, TCP), an - SSL socket, proxy CONNECT connection, a file descriptor (stdin etc.), the GNU - line editor (readline), a program, or a combination of two of these. - These modes include generation of "listening" sockets, named pipes, and pseudo - terminals. + socat is a relay for bidirectional data transfer between two independent + data channels. Each of these data channels may be a file, pipe, device + (serial line etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, + UDP, TCP), an SSL socket, proxy CONNECT connection, a file descriptor + (stdin etc.), the GNU line editor (readline), a program, or a + combination of two of these. These modes include generation of + "listening" sockets, named pipes, and pseudo terminals. endef MASTER_SITES = http://www.dest-unreach.org/socat/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWsocat,depend prototype) - DISTFILES += changelog.CSW -# We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://www.dest-unreach.org/socat/ + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Disable gcc specific options PATCHFILES = cc_compile.patch CONFIGURE_ARGS = $(DIRPATHS) + +# 200+ tests take a while. Run them manually when packaging a new version TEST_SCRIPTS = +EXTRA_EXCLUDE_FILES = $(bindir)/procan $(bindir)/filan + include gar/category.mk - -pre-configure: +# Run autoconf to re-evaulate the patched configure.in / Makefile.in +pre-configure-modulated: cd $(WORKSRC) && autoconf @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Mar 19 15:29:42 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 19 Mar 2009 14:29:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3818] csw/mgar/pkg/mcabber/trunk Message-ID: Revision: 3818 http://gar.svn.sourceforge.net/gar/?rev=3818&view=rev Author: skayser Date: 2009-03-19 14:29:42 +0000 (Thu, 19 Mar 2009) Log Message: ----------- mcabber: fixed typos, added samplerc Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/Makefile csw/mgar/pkg/mcabber/trunk/checksums csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff Modified: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile 2009-03-19 14:23:19 UTC (rev 3817) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) @@ -17,8 +17,8 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses CSWosslrt CSWotr -REQUIRED_PKGS = CSWaspell CSWggettextrt CSWglib2 -REQUIRED_PKGS = CSWgpgerr CSWgpgme CSWiconv +REQUIRED_PKGS += CSWaspell CSWggettextrt CSWglib2 +REQUIRED_PKGS += CSWgpgerr CSWgpgme CSWiconv TEST_SCRIPTS = @@ -43,7 +43,7 @@ PATCHFILES = patch-inline.diff # Solaris 8 doesn't have iswlbank(), provide replacement macro -PATCHFILES = patch-iswblank.diff +PATCHFILES += patch-iswblank.diff include gar/category.mk @@ -53,3 +53,10 @@ $(WORKSRC)/Makefile \ $(WORKSRC)/src/Makefile \ $(WORKSRC)/libjabber/Makefile + +post-install-modulated: + @perl -pi -e '\ + s|/usr/share/ssl/certs/ca-bundle.crt|/opt/csw/ssl/certs/ca-certificates.crt|;' \ + $(WORKSRC)/mcabberrc.example + @ginstall -d $(DESTDIR)$(docdir)$(GARNAME) + @cp $(WORKSRC)/mcabberrc.example $(DESTDIR)$(docdir)$(GARNAME) Modified: csw/mgar/pkg/mcabber/trunk/checksums =================================================================== --- csw/mgar/pkg/mcabber/trunk/checksums 2009-03-19 14:23:19 UTC (rev 3817) +++ csw/mgar/pkg/mcabber/trunk/checksums 2009-03-19 14:29:42 UTC (rev 3818) @@ -1,2 +1,3 @@ 189fb9d23f5a8412bc660884528475ea download/mcabber-0.9.9.tar.bz2 -756f80c0584594d5e66d3bdeadc5ca56 download/patch-iswblank.diff +a7ceb9f017c2c9267e2264aa626b7a4e download/patch-inline.diff +cff6d32fef59fc10806534025dc53f7e download/patch-iswblank.diff Modified: csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff 2009-03-19 14:23:19 UTC (rev 3817) +++ csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff 2009-03-19 14:29:42 UTC (rev 3818) @@ -1,5 +1,5 @@ ---- mcabber-0.9.9/src/histolog.c 2008-10-09 22:17:52.000000000 +0200 -+++ work/build-isa-sparcv8/mcabber-0.9.9/src/histolog.c 2009-03-08 16:35:25.758629698 +0100 +--- mcabber-0.9.9.orig/src/histolog.c 2008-10-09 22:17:52.000000000 +0200 ++++ mcabber-0.9.9/src/histolog.c 2009-03-08 16:35:25.758629698 +0100 @@ -398,7 +398,7 @@ return UseFileLogging; } @@ -18,9 +18,8 @@ enum imstatus status, const char *status_msg) { // XXX Check status value? -diff -ur mcabber-0.9.9/src/jabglue.c work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c ---- mcabber-0.9.9/src/jabglue.c 2008-10-09 22:17:52.000000000 +0200 -+++ work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c 2009-03-08 15:49:11.552806445 +0100 +--- mcabber-0.9.9.orig/src/jabglue.c 2008-10-09 22:17:52.000000000 +0200 ++++ mcabber-0.9.9/src/jabglue.c 2009-03-08 15:49:11.552806445 +0100 @@ -171,7 +171,7 @@ jc = NULL; } @@ -54,9 +53,8 @@ { jb_setstatus(mywantedstatus, NULL, mystatusmsg, FALSE); } -diff -ur mcabber-0.9.9/src/screen.c work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c ---- mcabber-0.9.9/src/screen.c 2008-10-09 22:17:52.000000000 +0200 -+++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c 2009-03-08 16:45:11.929482636 +0100 +--- mcabber-0.9.9.orig/src/screen.c 2008-10-09 22:17:52.000000000 +0200 ++++ mcabber-0.9.9/src/screen.c 2009-03-08 16:45:11.929482636 +0100 @@ -155,8 +156,8 @@ unsigned int prefix_flags, int force_show, unsigned mucnicklen); @@ -112,17 +110,3 @@ { return multimode; } -diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h ---- mcabber-0.9.9/src/screen.h 2008-10-09 22:17:52.000000000 +0200 -+++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 -@@ -20,6 +20,10 @@ - //static void spellcheck(char*, char*); - #endif - -+#ifndef HAVE_ISWBLANK -+#define iswblank(wc) iswctype(wc, wctype("blank")) -+#endif -+ - #include "hbuf.h" - #include "logprint.h" - Modified: csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff 2009-03-19 14:23:19 UTC (rev 3817) +++ csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff 2009-03-19 14:29:42 UTC (rev 3818) @@ -1,6 +1,5 @@ -diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h ---- mcabber-0.9.9/src/screen.h 2008-10-09 22:17:52.000000000 +0200 -+++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 +--- mcabber-0.9.9.orig/src/screen.h 2008-10-09 22:17:52.000000000 +0200 ++++ mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 @@ -20,6 +20,10 @@ //static void spellcheck(char*, char*); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Mar 19 15:37:46 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 19 Mar 2009 14:37:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[3819] csw/mgar/pkg/x11 Message-ID: Revision: 3819 http://gar.svn.sourceforge.net/gar/?rev=3819&view=rev Author: wbonnet Date: 2009-03-19 14:37:46 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Add description to *proto packages. Switch to arch all Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec csw/mgar/pkg/x11/kbproto/trunk/Makefile csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec csw/mgar/pkg/x11/renderproto/trunk/Makefile csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec csw/mgar/pkg/x11/xcb-proto/trunk/Makefile csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec csw/mgar/pkg/x11/xproto/trunk/Makefile csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) @@ -3,9 +3,9 @@ CATEGORIES = x11 -DESCRIPTION = inputproto +DESCRIPTION = Input extension headers define BLURB -inputproto +This provides the input extension headers from modular X.org X11 project endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname inputproto %var pkgname CSWinputproto +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright Modified: csw/mgar/pkg/x11/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) @@ -3,9 +3,9 @@ CATEGORIES = x11 -DESCRIPTION = kbproto +DESCRIPTION = KB extension headers from X.org define BLURB -kbproto +This provides the KB extension headers from modular X.org X11 project. endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname kbproto %var pkgname CSWkbproto +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname libpthreadstubs %var pkgname CSWlibpthreadstubs +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) @@ -3,9 +3,9 @@ CATEGORIES = x11 -DESCRIPTION = renderproto +DESCRIPTION = Render extension headers from modular X.org define BLURB -renderproto +This provides the Render extension headers from modular X.org X11 project. endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname renderproto %var pkgname CSWrenderproto +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) @@ -3,9 +3,25 @@ CATEGORIES = x11 -DESCRIPTION = xcb-proto +DESCRIPTION = XCB protocol descriptions (in XML) define BLURB -xcb-proto +The xcb-proto package provides the XML-XCB (X C Bindings) protocol +descriptions that libxcb uses to generate the majority of its code and API. +We provide them separately from libxcb to allow reuse by other projects, +such as additional language bindings, protocol dissectors, or +documentation generators. + +Separation of XCB's transport and protocol layers simplifies both +writing extensions and client-side support for extensions. +By contrast, with the xlib infrastructure, client-side support for +new extensions requires significant duplication of effort. With XCB and +the XML-XCB protocol descriptions, client-side support for a new +extension requires only an XML description of the extension--and not a +single line of code. + +Python libraries: xcb-proto also contains language-independent Python +libraries that are used to parse an XML description and create objects +used by Python code generators in individual language bindings. endef MASTER_SITES = $(XCB_MASTER_SITES) Modified: csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname xcbproto %var pkgname CSWxcbproto +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) @@ -3,14 +3,14 @@ CATEGORIES = x11 -DESCRIPTION = xextproto +DESCRIPTION = XExt extension headers from X.org define BLURB -xextproto +This provides the XExt extension headers from modular Xorg X11 endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWxextproto) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWxextproto) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname xextproto %var pkgname CSWxextproto +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright Modified: csw/mgar/pkg/x11/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) @@ -2,9 +2,9 @@ GARVERSION = 7.0.15 CATEGORIES = x11 -DESCRIPTION = xproto +DESCRIPTION = X protocol and ancillary headers from Xorg X11 define BLURB -xproto +X protocol and ancillary headers from modular Xorg X11 endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec 2009-03-19 14:29:42 UTC (rev 3818) +++ csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec 2009-03-19 14:37:46 UTC (rev 3819) @@ -1,5 +1,6 @@ %var bitname xproto %var pkgname CSWxproto +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Mar 19 16:47:40 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 19 Mar 2009 15:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[3820] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 3820 http://gar.svn.sourceforge.net/gar/?rev=3820&view=rev Author: bdwalton Date: 2009-03-19 15:47:39 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Version bump to 1.6.2.1 Modify how PKGFILES_ are put together to be more specific. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-03-19 14:37:46 UTC (rev 3819) +++ csw/mgar/pkg/git/trunk/Makefile 2009-03-19 15:47:39 UTC (rev 3820) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.6.2 +GARVERSION = 1.6.2.1 CATEGORIES = devel PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc @@ -65,12 +65,17 @@ PATCHFILES += 0006-configure-make-iconv-tests-aware-of-user-arguments.patch PATCHFILES += 0007-configure-rework-pthread-handling-to-allow-for-user.patch -PKGFILES_CSWgitsvn = .*svn.* -PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* -PKGFILES_CSWgitk = .*gitk.* +fdirs = $(bindir_install) $(mandir) $(libexecdir_install) +define _git_files +$(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* +endef + +PKGFILES_CSWgitsvn = $(call _git_files,git-svn) +PKGFILES_CSWgitgui = $(call _git_files,git-gui) $(call _git_files,git-citool) +PKGFILES_CSWgitk = $(call _git_files,gitk) +PKGFILES_CSWgitcvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) PKGFILES_CSWgitemacs = .*emacs.* -PKGFILES_CSWgitcvs = .*cvs.* -PKGFILES_CSWgitdoc = $(PKGFILES_DOC) +PKGFILES_CSWgitdoc = $(docdir)/.* # We define upstream file regex so we can be notifed of new upstream # software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Mar 19 17:50:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 19 Mar 2009 16:50:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3821] csw/mgar/pkg/x11 Message-ID: Revision: 3821 http://gar.svn.sourceforge.net/gar/?rev=3821&view=rev Author: wbonnet Date: 2009-03-19 16:50:20 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Update some checksums Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/checksums csw/mgar/pkg/x11/kbproto/trunk/checksums csw/mgar/pkg/x11/libXdmcp/trunk/Makefile csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums csw/mgar/pkg/x11/renderproto/trunk/checksums csw/mgar/pkg/x11/xcb-proto/trunk/checksums csw/mgar/pkg/x11/xextproto/trunk/checksums csw/mgar/pkg/x11/xproto/trunk/checksums Modified: csw/mgar/pkg/x11/inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/inputproto/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ edab35e039779f7f967e4f29878c5421 download/inputproto-1.5.0.tar.gz -9ebd15f41a7843d771d32300122a049f download/CSWinputproto.gspec +18c9a938f54119eca02836cf21b3f6bb download/CSWinputproto.gspec Modified: csw/mgar/pkg/x11/kbproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/kbproto/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ 1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz -6227977065ca8b6c2b4012bbe60d553a download/CSWkbproto.gspec +d6ad9e150887bbed709f99db1dc86e7e download/CSWkbproto.gspec Modified: csw/mgar/pkg/x11/libXdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/libXdmcp/trunk/Makefile 2009-03-19 16:50:20 UTC (rev 3821) @@ -24,9 +24,14 @@ PKGFILES_CSWlibxdmcpdevel += $(prefix)/X11/lib/pkgconfig/.* PKGFILES_CSWlibxdmcpdevel += $(prefix)/share/doc/$(GARNAME)/License-devel.txt +CONFIGURE_ARGS = $(DIRPATHS) + pre-install: @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)/License.txt @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)/License-devel.txt +EXTRA_PKG_CONFIG_DIRS += /opt/csw/X11/pkgconfig +PKG_CONFIG_PATH += /opt/csw/X11/pkgconfig + include gar/category.mk Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ 5e3e75160ab6a8c212d0ecd82aa04651 download/libpthread-stubs-0.1.tar.gz -d289155064dcff613df978b97c8d8199 download/CSWlibpthreadstubs.gspec +f5b34f077f7dfdb644340b71164c8c78 download/CSWlibpthreadstubs.gspec Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz -4efab345f11fb4991984f1a429f534ce download/CSWrenderproto.gspec +06af8b4e2064f0af6d8387feac391e2e download/CSWrenderproto.gspec Modified: csw/mgar/pkg/x11/xcb-proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ 475312ad5b41e6a543f92da82b9dd959 download/xcb-proto-1.4.tar.gz -187ab0fada6adab4e77ad04abfe9a093 download/CSWxcb-proto.gspec +4f2d170ade33aff0699aa1c8ee1e28ab download/CSWxcb-proto.gspec Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ f6274c778e571130484fb0650651ac02 download/xextproto-7.0.5.tar.gz -3ee092699b437a67b5050e8d31df191f download/CSWxextproto.gspec +e30e1b897995ae6d0044ae87f3e58756 download/CSWxextproto.gspec Modified: csw/mgar/pkg/x11/xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/checksums 2009-03-19 15:47:39 UTC (rev 3820) +++ csw/mgar/pkg/x11/xproto/trunk/checksums 2009-03-19 16:50:20 UTC (rev 3821) @@ -1,2 +1,2 @@ 9186713de3ec8a9fdd6ec3f4c4534fde download/xproto-7.0.15.tar.gz -247ed3e654992c599b58ed5e8ae92e8b download/CSWxproto.gspec +613afd970a2e684a1b6a5323569acdef download/CSWxproto.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Mar 19 18:40:32 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 19 Mar 2009 17:40:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3822] csw/mgar/pkg/x11 Message-ID: Revision: 3822 http://gar.svn.sourceforge.net/gar/?rev=3822&view=rev Author: wbonnet Date: 2009-03-19 17:40:32 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Update some descriptions Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xproto/trunk/Makefile Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-03-19 16:50:20 UTC (rev 3821) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-03-19 17:40:32 UTC (rev 3822) @@ -3,7 +3,7 @@ CATEGORIES = x11 -DESCRIPTION = Input extension headers +DESCRIPTION = Input extension headers from X.org project define BLURB This provides the input extension headers from modular X.org X11 project endef Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-03-19 16:50:20 UTC (rev 3821) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-03-19 17:40:32 UTC (rev 3822) @@ -5,7 +5,7 @@ DESCRIPTION = XExt extension headers from X.org define BLURB -This provides the XExt extension headers from modular Xorg X11 +This provides the XExt extension headers from modular X.org X11 endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) Modified: csw/mgar/pkg/x11/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-03-19 16:50:20 UTC (rev 3821) +++ csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-03-19 17:40:32 UTC (rev 3822) @@ -2,9 +2,9 @@ GARVERSION = 7.0.15 CATEGORIES = x11 -DESCRIPTION = X protocol and ancillary headers from Xorg X11 +DESCRIPTION = X protocol and ancillary headers from X.org X11 define BLURB -X protocol and ancillary headers from modular Xorg X11 +X protocol and ancillary headers from modular X.org X11 endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Mar 19 19:37:29 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 19 Mar 2009 18:37:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[3823] csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto. gspec Message-ID: Revision: 3823 http://gar.svn.sourceforge.net/gar/?rev=3823&view=rev Author: wbonnet Date: 2009-03-19 18:37:29 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Arch is not all for this proto Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec Modified: csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2009-03-19 17:40:32 UTC (rev 3822) +++ csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2009-03-19 18:37:29 UTC (rev 3823) @@ -1,6 +1,5 @@ %var bitname xcbproto %var pkgname CSWxcbproto -%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Mar 19 19:48:18 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 19 Mar 2009 18:48:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3824] csw/mgar/pkg/x11/xcb-proto/trunk/checksums Message-ID: Revision: 3824 http://gar.svn.sourceforge.net/gar/?rev=3824&view=rev Author: wbonnet Date: 2009-03-19 18:48:13 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Update checksums Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/checksums Modified: csw/mgar/pkg/x11/xcb-proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2009-03-19 18:37:29 UTC (rev 3823) +++ csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2009-03-19 18:48:13 UTC (rev 3824) @@ -1,2 +1,2 @@ 475312ad5b41e6a543f92da82b9dd959 download/xcb-proto-1.4.tar.gz -4f2d170ade33aff0699aa1c8ee1e28ab download/CSWxcb-proto.gspec +187ab0fada6adab4e77ad04abfe9a093 download/CSWxcb-proto.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Thu Mar 19 20:09:18 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 19 Mar 2009 19:09:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3825] csw/mgar/pkg/nagios/trunk/Makefile Message-ID: Revision: 3825 http://gar.svn.sourceforge.net/gar/?rev=3825&view=rev Author: j_arndt Date: 2009-03-19 19:09:17 +0000 (Thu, 19 Mar 2009) Log Message: ----------- nagios: makefile clean up Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-03-19 18:48:13 UTC (rev 3824) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-03-19 19:09:17 UTC (rev 3825) @@ -7,7 +7,7 @@ Nagios is a powerful, enterprise-class host, service, application, and network monitoring program. Designed to be fast, flexible, and rock-solid stable. Nagios runs on *NIX hosts and can monitor Windows, Linux/Unix/BSD, Netware, and network devices. endef -MASTER_SITES =$(SF_MIRRORS) +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype ) DISTFILES += cswnagios @@ -26,23 +26,19 @@ SPKG_CLASSES = none cswinitsmf +prefix = $(BUILD_PREFIX)/nagios +libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --prefix=/opt/csw/nagios -CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios +CONFIGURE_ARGS += --prefix=$(prefix) +CONFIGURE_ARGS += --exec-prefix=$(exec_prefix) CONFIGURE_ARGS += --with-command-user=nagios CONFIGURE_ARGS += --with-command-group=nagios -CONFIGURE_ARGS += --with-httpd-conf=/opt/csw/nagios/etc +CONFIGURE_ARGS += --with-httpd-conf=$(sysconfdir) CONFIGURE_ARGS += --enable-embedded-perl -sysconfdir ?= $(prefix)/nagios/etc -localstatedir ?= $(prefix)/nagios/var -bindir ?= $(prefix)/nagios/bin -sbindir ?= $(prefix)/nagios/sbin -libexecdir ?= $(prefix)/libexec/nagios-plugins -datadir ?= $(prefix)/nagios/share +EXTRA_LIB = $(BUILD_PREFIX)/lib -EXTRA_LIB = /opt/csw/lib - BUILD_ARGS = all TEST_TARGET = none @@ -51,14 +47,14 @@ INSTALL_ARGS += install-config INSTALL_ARGS += install-commandmode + include gar/category.mk DOCS = Changelog INSTALLING README UPGRADING -DOCDEST = $(DESTDIR)$(prefix)/share/doc/nagios +DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios HTTPD_CONF = $(DESTDIR)$(sysconfdir) post-install-modulated: - @echo $(DOCDEST) @ginstall -m 755 -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST) @@ -66,4 +62,3 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios @$(MAKECOOKIE) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Thu Mar 19 20:11:37 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 19 Mar 2009 19:11:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3826] csw/mgar/pkg/nsca/trunk/Makefile Message-ID: Revision: 3826 http://gar.svn.sourceforge.net/gar/?rev=3826&view=rev Author: j_arndt Date: 2009-03-19 19:11:37 +0000 (Thu, 19 Mar 2009) Log Message: ----------- nsca: more meaningful package description Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-19 19:09:17 UTC (rev 3825) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-19 19:11:37 UTC (rev 3826) @@ -3,7 +3,7 @@ CATEGORIES = apps SPKG_DESC_CSWnsca = Nagios service check acceptor - nagios server files only (the client package is send_nsca) -SPKG_DESC_CSWsendnsca = Nagios service check acceptor - send passive check results to nagios server (client files only) +SPKG_DESC_CSWsendnsca = Nagios service check acceptor - client files only (the server package is nsca) define BLURB NSCA allows you to integrate passive alerts and checks from remote machines and applications with Nagios. Useful for processing security alerts, as well as redundant and distributed Nagios setups. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 19 20:18:58 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 19 Mar 2009 19:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[3827] csw/mgar/pkg/xmlrpc_c/trunk Message-ID: Revision: 3827 http://gar.svn.sourceforge.net/gar/?rev=3827&view=rev Author: hson Date: 2009-03-19 19:18:52 +0000 (Thu, 19 Mar 2009) Log Message: ----------- xmlrpc-c: Going with stable version instead of super-stable Added Paths: ----------- csw/mgar/pkg/xmlrpc_c/trunk/Makefile csw/mgar/pkg/xmlrpc_c/trunk/checksums csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch Property Changed: ---------------- csw/mgar/pkg/xmlrpc_c/trunk/ Property changes on: csw/mgar/pkg/xmlrpc_c/trunk ___________________________________________________________________ Added: svn:ignore + cookies\ndownload\nwork\n Added: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-19 19:18:52 UTC (rev 3827) @@ -0,0 +1,44 @@ +GARNAME = xmlrpc-c +GARVERSION = 1.16.13 +SVN_REVISION = 1679 +CATEGORIES = lib + +DESCRIPTION = A lightweight RPC library based on XML and HTTP. +define BLURB + It's a spec and a set of implementations that allow software + running on disparate operating systems, running in different + environments to make procedure calls over the Internet. + It's remote procedure calling using HTTP as the transport and + XML as the encoding. XML-RPC is designed to be as simple as possible, + while allowing complex data structures to be transmitted, + processed and returned. +endef + +MASTER_SITES = svn-http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/ +DISTFILES = stable +DISTNAME = stable +NOCHECKSUM = stable +SVNHTTP_CO_ARGS = -r $(SVN_REVISION) --no-auth-cache --username guest --password guest + +SPKG_SOURCEURL = http://xmlrpc-c.sourceforge.net + +PACKAGES = CSWxmlrpc-c +CATALOGNAME_CSWxmlrpc-c = xmlrpc_c +SPKG_DESC_CSWxmlrpc-c = $(DESCRIPTION) + +PATCHFILES = mainpatch + +REQUIRED_PKGS_CSWxmlrpc-c = CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib + +# We define upstream file regex so we can be notifed of +# new upstream software release +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +#BUILD64 = 1 +#NO_ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/xmlrpc_c/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/checksums (rev 0) +++ csw/mgar/pkg/xmlrpc_c/trunk/checksums 2009-03-19 19:18:52 UTC (rev 3827) @@ -0,0 +1 @@ +4b1ac60cca84678a9bdfb7c145bd227e download/mainpatch Added: csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch (rev 0) +++ csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch 2009-03-19 19:18:52 UTC (rev 3827) @@ -0,0 +1,169 @@ +diff -ru ../stable.orig/config.mk.in stable/config.mk.in +--- ../stable.orig/config.mk.in 2009-03-19 06:00:07.627856581 +0100 ++++ stable/config.mk.in 2009-03-19 09:12:13.567567079 +0100 +@@ -187,6 +187,7 @@ + # Solaris compiler (Sun C 5.5) can't take multiple ld options as + # -Wl,-a,-b . Ld sees -a,-b in that case. + LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME) ++ CXXLDFLAGS_SHLIB = -Bdynamic -G -h $(SONAME) + CFLAGS_SHLIB = -Kpic + endif + +diff -ru ../stable.orig/lib/libutil/select.c stable/lib/libutil/select.c +--- ../stable.orig/lib/libutil/select.c 2009-03-19 05:59:43.875873563 +0100 ++++ stable/lib/libutil/select.c 2009-03-19 08:50:30.335123806 +0100 +@@ -1,4 +1,6 @@ ++#ifndef __sun + #define _XOPEN_SOURCE 600 /* Get pselect() in */ ++#endif + + #ifdef WIN32 + #include +diff -ru ../stable.orig/src/cpp/Makefile stable/src/cpp/Makefile +--- ../stable.orig/src/cpp/Makefile 2009-03-19 05:58:59.910486603 +0100 ++++ stable/src/cpp/Makefile 2009-03-19 09:13:04.787229910 +0100 +@@ -8,6 +8,8 @@ + + include $(BLDDIR)/config.mk + ++LDFLAGS_SHLIB =$(CXXLDFLAGS_SHLIB) ++ + default: all + + # libxmlrpc_cpp is the legacy C++ wrapper library. The others are the +@@ -167,6 +169,8 @@ + -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ + ++LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++) ++ + $(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \ + $(call shliblefn, libxmlrpc_server++) \ + $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ +diff -ru ../stable.orig/src/cpp/client.cpp stable/src/cpp/client.cpp +--- ../stable.orig/src/cpp/client.cpp 2009-03-19 05:58:59.244697817 +0100 ++++ stable/src/cpp/client.cpp 2009-03-19 08:50:30.390788638 +0100 +@@ -456,7 +456,7 @@ + + + void +-clientXmlTransport::finishAsync(xmlrpc_c::timeout) { ++clientXmlTransport::finishAsync(xmlrpc_c::timeout const) { + + // Since our start() does the whole thing, there's nothing for + // us to do. +@@ -504,7 +504,7 @@ + + + void +-clientXmlTransport::setInterrupt(int *) { ++clientXmlTransport::setInterrupt(int * const) { + + throwf("The client XML transport is not interruptible"); + } +@@ -896,7 +896,7 @@ + + + void +-client_xml::setInterrupt(int * const interruptP) { ++client_xml::setInterrupt(int * interruptP) { + + this->implP->transportP->setInterrupt(interruptP); + } +diff -ru ../stable.orig/src/cpp/libwww.cpp stable/src/cpp/libwww.cpp +--- ../stable.orig/src/cpp/libwww.cpp 2009-03-19 05:58:58.921926116 +0100 ++++ stable/src/cpp/libwww.cpp 2009-03-19 08:50:30.416995305 +0100 +@@ -141,7 +141,7 @@ + } + + #else // MUST_BUILD_LIBWWW_CLIENT +- clientXmlTransport_libwww::clientXmlTransport_libwww(string, string) { ++ clientXmlTransport_libwww::clientXmlTransport_libwww(string const, string const) { + + throw(error("There is no Libwww client XML transport " + "in this XML-RPC client library")); +diff -ru ../stable.orig/src/cpp/packetsocket.cpp stable/src/cpp/packetsocket.cpp +--- ../stable.orig/src/cpp/packetsocket.cpp 2009-03-19 05:58:59.387947753 +0100 ++++ stable/src/cpp/packetsocket.cpp 2009-03-19 08:50:30.441570893 +0100 +@@ -166,7 +166,7 @@ + + + +-packetSocket::packetSocket(int const sockFd) { ++packetSocket::packetSocket(int sockFd) { + + int dupRc; + +diff -ru ../stable.orig/src/cpp/test/server_abyss.cpp stable/src/cpp/test/server_abyss.cpp +--- ../stable.orig/src/cpp/test/server_abyss.cpp 2009-03-19 05:58:55.789530607 +0100 ++++ stable/src/cpp/test/server_abyss.cpp 2009-03-19 08:50:30.466112632 +0100 +@@ -14,7 +14,11 @@ + #ifdef WIN32 + #include + #else +- #include ++ #ifdef __sun ++ #include ++ #else ++ #include ++ #endif + #include + #include + #endif +diff -ru ../stable.orig/src/test/Makefile stable/src/test/Makefile +--- ../stable.orig/src/test/Makefile 2009-03-19 05:59:05.577343998 +0100 ++++ stable/src/test/Makefile 2009-03-19 08:50:30.490742022 +0100 +@@ -25,7 +25,7 @@ + + all: $(PROGS) + +-LDFLAGS = $(LADD) ++LDFLAGS = $(LADD) -lm + + TEST_OBJS = \ + test.o \ +diff -ru ../stable.orig/src/test/cgi.c stable/src/test/cgi.c +--- ../stable.orig/src/test/cgi.c 2009-03-19 05:59:04.026249087 +0100 ++++ stable/src/test/cgi.c 2009-03-19 09:41:03.971988485 +0100 +@@ -42,8 +42,9 @@ + TESTDATA_DIR DIRSEP "sample_add_call.xml", + "r"); + +- if (cgiOutputP == NULL) ++ if (cgiOutputP == NULL) { + TEST_ERROR("Unable to run 'cgitest' program."); ++ } + else { + unsigned char cgiResponse[4096]; + size_t bytesRead; +diff -ru ../stable.orig/src/test/test.h stable/src/test/test.h +--- ../stable.orig/src/test/test.h 2009-03-19 05:59:05.023815247 +0100 ++++ stable/src/test/test.h 2009-03-19 08:50:30.514813356 +0100 +@@ -76,9 +76,7 @@ + + + #define TEST_FAULT(envP, code) \ +- do { test_fault(envP, code, __FILE__, __LINE__); } while(0) +- +-; ++ do { test_fault(envP, code, __FILE__, __LINE__); } while(0) ; + + + static __inline__ void +@@ -96,14 +94,10 @@ + + + #define TEST_NULL_STRING(string) \ +- do { test_null_string(string, __FILE__, __LINE__); } while(0) +- +-; ++ do { test_null_string(string, __FILE__, __LINE__); } while(0) ; + + #define TEST_ERROR(reason) \ + do { \ + printf("Unable to test at %s/%u. %s", __FILE__, __LINE__, reason); \ + abort(); \ +- } while (0) +- +-; ++ } while (0) ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 19 20:22:51 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 19 Mar 2009 19:22:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[3828] csw/mgar/pkg/xmlrpc_c/trunk/ Message-ID: Revision: 3828 http://gar.svn.sourceforge.net/gar/?rev=3828&view=rev Author: hson Date: 2009-03-19 19:22:49 +0000 (Thu, 19 Mar 2009) Log Message: ----------- xmlrpc-c: Setting ignore flags Property Changed: ---------------- csw/mgar/pkg/xmlrpc_c/trunk/ Property changes on: csw/mgar/pkg/xmlrpc_c/trunk ___________________________________________________________________ Modified: svn:ignore - cookies\ndownload\nwork\n + cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 19 20:51:45 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 19 Mar 2009 19:51:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3829] csw/mgar/pkg/gtk-doc/trunk/Makefile Message-ID: Revision: 3829 http://gar.svn.sourceforge.net/gar/?rev=3829&view=rev Author: hson Date: 2009-03-19 19:51:45 +0000 (Thu, 19 Mar 2009) Log Message: ----------- gtk-doc: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/gtk-doc/trunk/Makefile Modified: csw/mgar/pkg/gtk-doc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-19 19:22:49 UTC (rev 3828) +++ csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-19 19:51:45 UTC (rev 3829) @@ -14,7 +14,7 @@ DISTFILES += $(call admfiles,CSWgtkdoc, ) PREREQUISITE_PKGS += CSWsgmlcommon CSWxmlcommon CSWdocbookxsl CSWscrollkeeper -PREREQUISITE_PKGS += CSWopenjade +PREREQUISITE_PKGS += CSWopenjade CSWgnomedocutils # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 19 21:39:07 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 19 Mar 2009 20:39:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[3830] csw/mgar/pkg/gtk-doc/trunk/Makefile Message-ID: Revision: 3830 http://gar.svn.sourceforge.net/gar/?rev=3830&view=rev Author: hson Date: 2009-03-19 20:39:06 +0000 (Thu, 19 Mar 2009) Log Message: ----------- gtk-doc: Add some required packages Modified Paths: -------------- csw/mgar/pkg/gtk-doc/trunk/Makefile Modified: csw/mgar/pkg/gtk-doc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-19 19:51:45 UTC (rev 3829) +++ csw/mgar/pkg/gtk-doc/trunk/Makefile 2009-03-19 20:39:06 UTC (rev 3830) @@ -16,13 +16,16 @@ PREREQUISITE_PKGS += CSWsgmlcommon CSWxmlcommon CSWdocbookxsl CSWscrollkeeper PREREQUISITE_PKGS += CSWopenjade CSWgnomedocutils +REQUIRED_PKGS += CSWperl CSWpython CSWsgmlcommon CSWxmlcommon CSWdocbookxsl +REQUIRED_PKGS += CSWopenjade CSWgnomedocutils + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-xml-catalog=/opt/csw/etc/xml/catalog -#TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = check +#TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Thu Mar 19 22:30:39 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 19 Mar 2009 21:30:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[3831] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 3831 http://gar.svn.sourceforge.net/gar/?rev=3831&view=rev Author: j_arndt Date: 2009-03-19 21:30:39 +0000 (Thu, 19 Mar 2009) Log Message: ----------- nagios: included cswpreserveconf Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2009-03-19 20:39:06 UTC (rev 3830) +++ csw/mgar/pkg/nagios/trunk/Makefile 2009-03-19 21:30:39 UTC (rev 3831) @@ -22,9 +22,9 @@ # necessary, so ginstall doesn't get -o and -g options REQUIRED_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt -REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWnrpeplugin CSWcswclassutils +REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWcswclassutils -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES = none cswpreserveconf cswinitsmf prefix = $(BUILD_PREFIX)/nagios libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins @@ -41,24 +41,40 @@ BUILD_ARGS = all +ENABLE_CHECK = 0 + TEST_TARGET = none INSTALL_ARGS += install-init -INSTALL_ARGS += install-config +#INSTALL_ARGS += install-config INSTALL_ARGS += install-commandmode - include gar/category.mk DOCS = Changelog INSTALLING README UPGRADING DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios HTTPD_CONF = $(DESTDIR)$(sysconfdir) +CFGDIR = $(prefix)/etc post-install-modulated: - @ginstall -m 755 -d $(DOCDEST) + @ginstall -m 755 -d $(DOCDEST) + @ginstall -m 755 -d $(HTTPD_CONF) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST) @ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(HTTPD_CONF)/httpd-nagios.conf @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios + @ginstall -m 775 -d $(DESTDIR)$(CFGDIR) + @ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/objects + @ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW + @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2009-03-19 20:39:06 UTC (rev 3830) +++ csw/mgar/pkg/nagios/trunk/checksums 2009-03-19 21:30:39 UTC (rev 3831) @@ -3,7 +3,7 @@ e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall 47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -b3edb7772696d23bfc3973e04b7d8d5d download/CSWnagios.prototype +a238294a9fc50821dd134b2a50fff545 download/CSWnagios.prototype d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios 0ef601e30d01a511822dd27df6b0e531 download/patch.diff 4faa5ec86586be23dfbbd9165f50046d download/configure.diff Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-19 20:39:06 UTC (rev 3830) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-19 21:30:39 UTC (rev 3831) @@ -4,19 +4,19 @@ f none /opt/csw/nagios/bin/nagiostats 0774 nagios nagios f none /opt/csw/nagios/bin/p1.pl 0664 nagios nagios d none /opt/csw/nagios/etc 0755 nagios nagios -f none /opt/csw/nagios/etc/cgi.cfg 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/cgi.cfg.CSW 0664 nagios nagios f none /opt/csw/nagios/etc/httpd-nagios.conf 0644 nagios nagios -f none /opt/csw/nagios/etc/nagios.cfg 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/nagios.cfg.CSW 0664 nagios nagios d none /opt/csw/nagios/etc/objects 0755 nagios nagios -f none /opt/csw/nagios/etc/objects/commands.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/contacts.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/localhost.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/printer.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/switch.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/templates.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/timeperiods.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/objects/windows.cfg 0664 nagios nagios -f none /opt/csw/nagios/etc/resource.cfg 0660 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/commands.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/contacts.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/localhost.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/printer.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/switch.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/templates.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/timeperiods.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/objects/windows.cfg.CSW 0664 nagios nagios +f cswpreserveconf /opt/csw/nagios/etc/resource.cfg.CSW 0660 nagios nagios d none /opt/csw/nagios/libexec 0755 nagios nagios d none /opt/csw/nagios/sbin 0755 nagios nagios f none /opt/csw/nagios/sbin/avail.cgi 0775 nagios nagios This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Thu Mar 19 22:31:52 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 19 Mar 2009 21:31:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[3832] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 3832 http://gar.svn.sourceforge.net/gar/?rev=3832&view=rev Author: j_arndt Date: 2009-03-19 21:31:51 +0000 (Thu, 19 Mar 2009) Log Message: ----------- nsca: included cswpreserveconf Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-19 21:30:39 UTC (rev 3831) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-19 21:31:51 UTC (rev 3832) @@ -20,7 +20,7 @@ REQUIRED_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils REQUIRED_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt -SPKG_CLASSES_CSWnsca = none cswinitsmf +SPKG_CLASSES_CSWnsca = none cswpreserveconf cswinitsmf CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 @@ -46,7 +46,7 @@ ginstall -d $(DESTDIR)$(NAGIOSCFGDIR) ginstall -m 755 -d $(DESTDIR)$(NSCADOCDIR) ginstall -m 755 $(WORKSRC)/src/nsca $(DESTDIR)$(NAGIOSBINDIR) - ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg-sample + ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg $(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg.CSW ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(NSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(NSCADOCDIR) @@ -54,7 +54,7 @@ ginstall -m 755 $(WORKSRC)/src/send_nsca $(DESTDIR)$(BINDIR) ginstall -m 755 -d $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 755 $(WORKSRC)/src/submit_check_result-sample $(DESTDIR)$(SENDNSCADOCDIR) - ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg-sample + ginstall -m 600 $(WORKSRC)/sample-config/send_nsca.cfg $(DESTDIR)$(CFGDIR)/send_nsca.cfg.CSW ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(SENDNSCADOCDIR) ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(SENDNSCADOCDIR) Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2009-03-19 21:30:39 UTC (rev 3831) +++ csw/mgar/pkg/nsca/trunk/checksums 2009-03-19 21:31:51 UTC (rev 3832) @@ -1,10 +1,10 @@ 33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz 82f1144c12dc6247524609dbeefc3023 download/CSWnsca.gspec -8dfc4283d41a0c127a00170ab285c18d download/CSWnsca.prototype +fee61a84d3032fff1c44ccabbdde7937 download/CSWnsca.prototype 1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall 7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall 0f458cf358b1aab192c02fd0d37b1220 download/CSWsendnsca.gspec -67d4566b83bad9e981bae7e889217c85 download/CSWsendnsca.prototype +ccdb574704fbff33a22ba4b10ba028bf download/CSWsendnsca.prototype 8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall 55a1c5523b2fe1ee66b45a2807e80bd6 download/cswnsca 08b769c5511342dd03fa01fea44cb260 download/submit_check_results.diff Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-19 21:30:39 UTC (rev 3831) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-19 21:31:51 UTC (rev 3832) @@ -1,7 +1,7 @@ 1 d none /opt/csw/nagios/bin 0755 nagios nagios 1 f none /opt/csw/nagios/bin/nsca 0755 nagios nagios 1 d none /opt/csw/nagios/etc 0755 nagios nagios -1 f none /opt/csw/nagios/etc/nsca.cfg-sample 0600 nagios nagios +1 f cswpreserveconf /opt/csw/nagios/etc/nsca.cfg.CSW 0600 nagios nagios 1 d none /opt/csw/share/doc/nsca 0755 root bin 1 f none /opt/csw/share/doc/nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/nsca/LEGAL 0644 root bin Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-03-19 21:30:39 UTC (rev 3831) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2009-03-19 21:31:51 UTC (rev 3832) @@ -1,7 +1,7 @@ 1 d none /opt/csw/bin 0755 root bin 1 f none /opt/csw/bin/send_nsca 0755 root bin 1 d none /opt/csw/etc 0755 root bin -1 f none /opt/csw/etc/send_nsca.cfg-sample 0644 root bin +1 f cswpreserveconf /opt/csw/etc/send_nsca.cfg.CSW 0644 root bin 1 d none /opt/csw/share/doc/send_nsca 0755 root bin 1 f none /opt/csw/share/doc/send_nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/send_nsca/LEGAL 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Thu Mar 19 22:32:28 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 19 Mar 2009 21:32:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[3833] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 3833 http://gar.svn.sourceforge.net/gar/?rev=3833&view=rev Author: j_arndt Date: 2009-03-19 21:32:27 +0000 (Thu, 19 Mar 2009) Log Message: ----------- nrpe: included cswpreserveconf Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-19 21:31:51 UTC (rev 3832) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-19 21:32:27 UTC (rev 3833) @@ -19,7 +19,7 @@ REQUIRED_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt -SPKG_CLASSES_CSWnrpe = none cswinitsmf +SPKG_CLASSES_CSWnrpe = none cswpreserveconf cswinitsmf CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib @@ -60,7 +60,7 @@ ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR) ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR) ginstall -m 775 -d $(DESTDIR)$(CFGDIR) - ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg-sample + ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg.CSW ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe @$(MAKECOOKIE) Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-03-19 21:31:51 UTC (rev 3832) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-03-19 21:32:27 UTC (rev 3833) @@ -1,6 +1,6 @@ b2d75e2962f1e3151ef58794d60c9e97 download/nrpe-2.12.tar.gz 1c656040abd280f9228b42df744d93eb download/CSWnrpe.gspec -11953efe2c65e3efb7c39342185a96ba download/CSWnrpe.prototype +ab50f565dba01e9c891f7fd0fc585fda download/CSWnrpe.prototype bda68135e2b65da40c3d2b68a3b8dc78 download/CSWnrpe.checkinstall 53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall 393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-03-19 21:31:51 UTC (rev 3832) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2009-03-19 21:32:27 UTC (rev 3833) @@ -1,7 +1,7 @@ d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/nrpe 0775 root bin d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/nrpe.cfg-sample 0644 root bin +f cswpreserveconf /opt/csw/etc/nrpe.cfg.CSW 0644 root bin d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 19 23:43:38 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 19 Mar 2009 22:43:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[3834] csw/mgar/pkg/xmlrpc_c/trunk/Makefile Message-ID: Revision: 3834 http://gar.svn.sourceforge.net/gar/?rev=3834&view=rev Author: hson Date: 2009-03-19 22:43:37 +0000 (Thu, 19 Mar 2009) Log Message: ----------- xmlrpc_c: Add license and docfiles to Makefile Modified Paths: -------------- csw/mgar/pkg/xmlrpc_c/trunk/Makefile Modified: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-19 21:32:27 UTC (rev 3833) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2009-03-19 22:43:37 UTC (rev 3834) @@ -20,6 +20,9 @@ NOCHECKSUM = stable SVNHTTP_CO_ARGS = -r $(SVN_REVISION) --no-auth-cache --username guest --password guest +LICENSE = doc/COPYING +DOCFILES += CREDITS DEVELOPING HISTORY INSTALL SECURITY TESTING TODO + SPKG_SOURCEURL = http://xmlrpc-c.sourceforge.net PACKAGES = CSWxmlrpc-c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 20 09:19:03 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 20 Mar 2009 08:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[3835] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 3835 http://gar.svn.sourceforge.net/gar/?rev=3835&view=rev Author: hson Date: 2009-03-20 08:19:03 +0000 (Fri, 20 Mar 2009) Log Message: ----------- netsnmp: lmSensors only work on sparc Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2009-03-19 22:43:37 UTC (rev 3834) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2009-03-20 08:19:03 UTC (rev 3835) @@ -32,7 +32,7 @@ CONFIGURE_ARGS += --with-sys-location=unknown CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp -CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio ucd-snmp/lmSensors agentx mibII/mta_sendmail' +CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio agentx mibII/mta_sendmail' CONFIGURE_ARGS += '--with-libwrap=/opt/csw/lib' CONFIGURE_ARGS += '--enable-ipv6' CONFIGURE_ARGS += '--with-transports=UDP TCP Unix' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Mar 20 09:35:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Mar 2009 08:35:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[3836] csw/mgar/pkg/libgpg_error/trunk Message-ID: Revision: 3836 http://gar.svn.sourceforge.net/gar/?rev=3836&view=rev Author: dmichelsen Date: 2009-03-20 08:35:33 +0000 (Fri, 20 Mar 2009) Log Message: ----------- gpgerr: Use dynamic gspec, depend on CSWggettextrt Modified Paths: -------------- csw/mgar/pkg/libgpg_error/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libgpg_error/trunk/files/CSWgpgerr.gspec Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/Makefile 2009-03-20 08:19:03 UTC (rev 3835) +++ csw/mgar/pkg/libgpg_error/trunk/Makefile 2009-03-20 08:35:33 UTC (rev 3836) @@ -10,13 +10,15 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libgpg-error/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWgpgerr,) +PACKAGES = CSWgpgerr +CATALOGNAME = libgpg_error + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://www.gnupg.org/download/ -REQUIRED_PKGS = CSWiconv CSWggettext +REQUIRED_PKGS = CSWiconv CSWggettextrt BUILD64 = 1 NO_ISAEXEC = 1 Deleted: csw/mgar/pkg/libgpg_error/trunk/files/CSWgpgerr.gspec =================================================================== --- csw/mgar/pkg/libgpg_error/trunk/files/CSWgpgerr.gspec 2009-03-20 08:19:03 UTC (rev 3835) +++ csw/mgar/pkg/libgpg_error/trunk/files/CSWgpgerr.gspec 2009-03-20 08:35:33 UTC (rev 3836) @@ -1,4 +0,0 @@ -%var bitname libgpg_error -%var pkgname CSWgpgerr -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Mar 20 12:07:47 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 20 Mar 2009 11:07:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[3837] csw/mgar/pkg/thunderbird/trunk Message-ID: Revision: 3837 http://gar.svn.sourceforge.net/gar/?rev=3837&view=rev Author: wbonnet Date: 2009-03-20 11:07:47 +0000 (Fri, 20 Mar 2009) Log Message: ----------- Update to 2.0.0.21 Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/Makefile csw/mgar/pkg/thunderbird/trunk/checksums Added Paths: ----------- csw/mgar/pkg/thunderbird/trunk/files/.mozconfig Modified: csw/mgar/pkg/thunderbird/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/trunk/Makefile 2009-03-20 08:35:33 UTC (rev 3836) +++ csw/mgar/pkg/thunderbird/trunk/Makefile 2009-03-20 11:07:47 UTC (rev 3837) @@ -1,5 +1,5 @@ GARNAME = thunderbird -GARVERSION = 2.0.0.19 +GARVERSION = 2.0.0.21 CATEGORIES = apps DISTNAME = $(GARNAME) Modified: csw/mgar/pkg/thunderbird/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird/trunk/checksums 2009-03-20 08:35:33 UTC (rev 3836) +++ csw/mgar/pkg/thunderbird/trunk/checksums 2009-03-20 11:07:47 UTC (rev 3837) @@ -1,2 +1,2 @@ -546e81748f5f8bf06cacbcb8c358395f download/thunderbird-2.0.0.19-source.tar.bz2 +55e24753a7ccf2fbf0272987dd4bb086 download/thunderbird-2.0.0.21-source.tar.bz2 3a6b0245afd9c4e8b624f2455767574e download/CSWthunderbird.gspec Added: csw/mgar/pkg/thunderbird/trunk/files/.mozconfig =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/.mozconfig (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/.mozconfig 2009-03-20 11:07:47 UTC (rev 3837) @@ -0,0 +1,30 @@ +. $topsrcdir/mail/config/mozconfig +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/thunderbird-opt-static +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +# mk_add_options CFLAGS="-xc99=all" + +ac_add_options --enable-application=mail +ac_add_options --enable-xft +ac_add_options --enable-svg +ac_add_options --enable-shared +ac_add_options --enable-optimize="-xO3" +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xinerama +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --enable-strip-libs +ac_add_options --enable-crypto +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-auto-deps +ac_add_options --disable-freetype2 +ac_add_options --disable-updater +ac_add_options --prefix=/opt/csw/mozilla +ac_add_options --disable-debug +ac_add_options --disable-updater +ac_add_options --disable-js-ultrasparc + +ac_add_options --enable-system-cairo + +# ac_add_options --enable-extensions=default This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 20 12:21:20 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 20 Mar 2009 11:21:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[3838] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 3838 http://gar.svn.sourceforge.net/gar/?rev=3838&view=rev Author: hson Date: 2009-03-20 11:21:11 +0000 (Fri, 20 Mar 2009) Log Message: ----------- xmlto: PREREQUISITE_PKGS gets overwritten, CSWmktemp missing as dependency Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-03-20 11:07:47 UTC (rev 3837) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-03-20 11:21:11 UTC (rev 3838) @@ -2,11 +2,11 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt -PREREQUISITE_PKGS = CSWflex CSWggetopt CSWgnulinks +PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt +PREREQUISITE_PKGS += CSWflex CSWggetopt CSWgnulinks REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds -REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m +REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp DESCRIPTION = An XSL toolchain front end. define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Mar 20 12:44:28 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 20 Mar 2009 11:44:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[3839] csw/mgar/pkg/socat/trunk Message-ID: Revision: 3839 http://gar.svn.sourceforge.net/gar/?rev=3839&view=rev Author: skayser Date: 2009-03-20 11:44:28 +0000 (Fri, 20 Mar 2009) Log Message: ----------- socat: tweaked test script, added CSW files Modified Paths: -------------- csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/socat/trunk/checksums csw/mgar/pkg/socat/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/socat/trunk/files/README.CSW csw/mgar/pkg/socat/trunk/files/patch-test.diff Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2009-03-20 11:21:11 UTC (rev 3838) +++ csw/mgar/pkg/socat/trunk/Makefile 2009-03-20 11:44:28 UTC (rev 3839) @@ -15,25 +15,94 @@ MASTER_SITES = http://www.dest-unreach.org/socat/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += changelog.CSW SPKG_SOURCEURL = http://www.dest-unreach.org/socat/ +REQUIRED_PKGS = CSWosslrt CSWreadline CSWtcpwrap + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Disable gcc specific options PATCHFILES = cc_compile.patch +# Fix some broken tests (pending to push some of it upstream) +PATCHFILES += patch-test.diff + CONFIGURE_ARGS = $(DIRPATHS) -# 200+ tests take a while. Run them manually when packaging a new version +# 250+ tests take a while. Run them manually when packaging a new version TEST_SCRIPTS = -EXTRA_EXCLUDE_FILES = $(bindir)/procan $(bindir)/filan +# When you run the tests on a non IPV6 system you can set HAVENOT_IP6 +# to shortcut some tests +#TEST_ENV="HAVENOT_IP6=1" +# Running test.sh on a non IPV6 system as root i get: +# +# summary: 276 tests; 149 ok, 19 failed, 107 could not be performed +# +# The 19 FAILED ones are +# +# test 123 PTMXWAITSLAVE: test if master pty (ptmx) waits for slave connection +# test 208 UDP4SCM_IP_OPTIONS: UDP4 log ancillary message IP_OPTIONS options +# test 210 UDP4SCM_IP_TTL: UDP4 log ancillary message IP_TTL ttl +# test 215 UDP4SCM_IP_RECVIF: UDP4 log ancillary message IP_RECVIF if +# test 216 UDP4SCM_IP_RECVDSTADDR: UDP4 log ancillary message IP_RECVDSTADDR dstaddr +# test 217 IP4SCM_IP_OPTIONS: IP4 log ancillary message IP_OPTIONS options +# test 219 IP4SCM_IP_TTL: IP4 log ancillary message IP_TTL ttl +# test 224 IP4SCM_IP_RECVIF: IP4 log ancillary message IP_RECVIF if +# test 225 IP4SCM_IP_RECVDSTADDR: IP4 log ancillary message IP_RECVDSTADDR dstaddr +# +# test 234 TCP4LISTENENV: TCP4-LISTEN fills environment variables with socket addresses +# test 239 UNIXLISTENENV: UNIX-LISTEN fills environment variables with socket addresses +# +# test 240 UDP4ENV_IP_OPTIONS: UDP4 ancillary message brings IP_OPTIONS into environment +# test 242 UDP4ENV_IP_TTL: UDP4 ancillary message brings IP_TTL into environment +# test 247 UDP4ENV_IP_IF: UDP4 ancillary message brings IP_IF into environment +# test 248 UDP4ENV_IP_DSTADDR: UDP4 ancillary message brings IP_DSTADDR into environment +# test 249 IP4ENV_IP_OPTIONS: IP4 ancillary message brings IP_OPTIONS into environment +# test 251 IP4ENV_IP_TTL: IP4 ancillary message brings IP_TTL into environment +# test 256 IP4ENV_IP_IF: IP4 ancillary message brings IP_IF into environment +# test 257 IP4ENV_IP_DSTADDR: IP4 ancillary message brings IP_DSTADDR into environment +# +# Most of them (all of them?) relate to ancillary data. Seems as if there are two +# competing socket libraries on Solaris: 3SOCKET and 3XNET, where only the latter +# handles ancillary data. +# +# http://www.mail-archive.com/networking-discuss at opensolaris.org/msg01146.html +# +# 3XNET is only defined when using SUS/XPG4v2 feature macros. socat README suggests +# +# EXTRA_CFLAGS = -D_XPG4_2 -D__EXTENSIONS__ +# +# However, when compiling with these flags the above tests still fail. +# Might well be that the ancillary data handling within socat is not +# coded to work on Solaris. +# +# As a matter of fact, the socat man page even points out that some of +# the address options related to ancillary data are restricted to +# specific platforms (see IP4 and IP6 option groups). + +# Note to self: standards(5) says something like the following for XPG4v2 +#EXTRA_CFLAGS = -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ +#EXTRA_LDFLAGS = -lxnet + +# Individual tests can be run by changing to $(WORKSRC) and running +# +# ./test.sh +# +# where TESTNAME is one of the uppercase testnames from above (for example PTMXWAITSLAVE). +# + include gar/category.mk # Run autoconf to re-evaulate the patched configure.in / Makefile.in pre-configure-modulated: cd $(WORKSRC) && autoconf @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(FILEDIR)/README.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/socat/trunk/checksums =================================================================== --- csw/mgar/pkg/socat/trunk/checksums 2009-03-20 11:21:11 UTC (rev 3838) +++ csw/mgar/pkg/socat/trunk/checksums 2009-03-20 11:44:28 UTC (rev 3839) @@ -1,6 +1,3 @@ -5a6a1d1e398d5c4d32fa6515baf477af download/socat-1.6.0.1.tar.gz -301932abeb50285749feb22cf659ebfe download/CSWsocat.gspec -f824e7d56a8a1e8181fdf49842540b24 download/CSWsocat.depend -27d6d97af6bb7cc2cb73f986e7826f1f download/CSWsocat.prototype -9f6dbf38c969bc9ad90807350be191d8 download/changelog.CSW +82967132b5a8ca4d07e54370fdcb2662 download/socat-1.7.0.0.tar.gz 06fac9e8c6e979e163630163238296d8 download/cc_compile.patch +04ac1b9432d18d62d43a00e0f73d6449 download/patch-test.diff Added: csw/mgar/pkg/socat/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/socat/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/socat/trunk/files/README.CSW 2009-03-20 11:44:28 UTC (rev 3839) @@ -0,0 +1,8 @@ +Known issues +------------ +Some of the IP4/IP6 socket options related to ancillary messages don't +work with this build. This comprises ip-recvopts, ip-recvttl and alike +and seems to be a known socat portability issue. + +See "IP4 and IP6 option groups" in the socat man page. Options marked as +Linux and/or *BSD won't work. Modified: csw/mgar/pkg/socat/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/socat/trunk/files/changelog.CSW 2009-03-20 11:21:11 UTC (rev 3838) +++ csw/mgar/pkg/socat/trunk/files/changelog.CSW 2009-03-20 11:44:28 UTC (rev 3839) @@ -1,5 +1,5 @@ -socat (1.6.0.1,REV=20080407) unstable +socat (1.7.0.0,REV=20090320) * Initial package. - -- Yann Rouillard Mon, 07 Apr 2008 23:02:18 +0200 + -- Sebastian Kayser Fri, 20 Mar 2009 11:38:48 +0100 Added: csw/mgar/pkg/socat/trunk/files/patch-test.diff =================================================================== --- csw/mgar/pkg/socat/trunk/files/patch-test.diff (rev 0) +++ csw/mgar/pkg/socat/trunk/files/patch-test.diff 2009-03-20 11:44:28 UTC (rev 3839) @@ -0,0 +1,61 @@ +diff --speed-large-files --minimal -Nru socat-1.7.0.0.orig/readline-test.sh socat-1.7.0.0/readline-test.sh +--- socat-1.7.0.0.orig/readline-test.sh 2008-09-22 22:33:30.000000000 +0200 ++++ socat-1.7.0.0/readline-test.sh 2009-03-19 20:57:41.847390097 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /opt/csw/bin/bash + # source: readline-test.sh + # Copyright Gerhard Rieger 2003-2008 + # Published under the GNU General Public License V.2, see file COPYING +diff --speed-large-files --minimal -Nru socat-1.7.0.0.orig/test.sh socat-1.7.0.0/test.sh +--- socat-1.7.0.0.orig/test.sh 2008-10-14 19:16:32.000000000 +0200 ++++ socat-1.7.0.0/test.sh 2009-03-19 20:57:29.843380940 +0100 +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /opt/csw/bin/bash + # source: test.sh + # Copyright Gerhard Rieger 2001-2008 + # Published under the GNU General Public License V.2, see file COPYING +@@ -11,6 +11,10 @@ + + #set -vx + ++# /usr/bin/tr doesn't handle the a-z range syntax (needs [a-z]) which ++# is used throughout this script ++alias tr=/usr/xpg4/bin/tr ++ + val_t=0.1 + NUMCOND=true + #NUMCOND="test \$N -gt 70" +@@ -8931,6 +8935,9 @@ + elif [ "$ROOT" = root -a $(id -u) -ne 0 -a "$withroot" -eq 0 ]; then + $PRINTF "test $F_n $TEST... ${YELLOW}must be root${NORMAL}\n" $N + numCANT=$((numCANT+1)) ++elif [ "$PF" = "IP6" ] && ( ! feat=$(testaddrs ip6) || ! runsip6 >/dev/null ); then ++ $PRINTF "test $F_n $TEST... ${YELLOW}IP6 not available${NORMAL}\n" $N ++ numCANT=$((numCANT+1)) + else + tf="$td/test$N.stdout" + te="$td/test$N.stderr" +@@ -9051,6 +9058,11 @@ + elif ! feat=$(testaddrs $FEAT); then + $PRINTF "test $F_n $TEST... ${YELLOW}$(echo $feat |tr a-z A-Z) not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) ++ ++elif [ "$KEYW" = "TCP6" -o "$KEYW" = "UDP6" -o "$KEYW" = "SCTP6" ] && \ ++ ( ! feat=$(testaddrs ip6) || ! runsip6 >/dev/null ); then ++ $PRINTF "test $F_n $TEST... ${YELLOW}IP6 not available${NORMAL}\n" $N ++ numCANT=$((numCANT+1)) + else + tf="$td/test$N.stdout" + te="$td/test$N.stderr" +@@ -9146,6 +9158,9 @@ + elif [ "$ROOT" = root -a $(id -u) -ne 0 -a "$withroot" -eq 0 ]; then + $PRINTF "test $F_n $TEST... ${YELLOW}must be root${NORMAL}\n" $N + numCANT=$((numCANT+1)) ++elif [ "$PF" = "IP6" ] && ( ! feat=$(testaddrs ip6) || ! runsip6 ) >/dev/null; then ++ $PRINTF "test $F_n $TEST... ${YELLOW}IP6 not available${NORMAL}\n" $N ++ numCANT=$((numCANT+1)) + else + tf="$td/test$N.stdout" + te="$td/test$N.stderr" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Mar 20 13:34:36 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 20 Mar 2009 12:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[3840] csw/mgar/pkg/cpan/Mail-DKIM/trunk Message-ID: Revision: 3840 http://gar.svn.sourceforge.net/gar/?rev=3840&view=rev Author: idogan23 Date: 2009-03-20 12:34:36 +0000 (Fri, 20 Mar 2009) Log Message: ----------- Mail-DKIM: updated to 0.33 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2009-03-20 11:44:28 UTC (rev 3839) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2009-03-20 12:34:36 UTC (rev 3840) @@ -1,5 +1,5 @@ GARNAME = Mail-DKIM -GARVERSION = 0.32 +GARVERSION = 0.33 CATEGORIES = cpan AUTHOR = JASLONG Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums 2009-03-20 11:44:28 UTC (rev 3839) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums 2009-03-20 12:34:36 UTC (rev 3840) @@ -1,3 +1,3 @@ 5caf562501bb6c7a2623ad5627954e73 download/CSWpmmaildkim.gspec f7cfb431ff18d457874d604340804d85 download/CSWpmmaildkim.depend -05592f264e0fbc758b93a4aa37bd7fd5 download/Mail-DKIM-0.32.tar.gz +09216a6544439c212efdd70e4bd106ca download/Mail-DKIM-0.33.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Mar 20 13:54:33 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 20 Mar 2009 12:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[3841] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 3841 http://gar.svn.sourceforge.net/gar/?rev=3841&view=rev Author: idogan23 Date: 2009-03-20 12:54:33 +0000 (Fri, 20 Mar 2009) Log Message: ----------- BerkeleyDB: updated do 0.38 Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2009-03-20 12:34:36 UTC (rev 3840) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2009-03-20 12:54:33 UTC (rev 3841) @@ -1,5 +1,5 @@ GARNAME = BerkeleyDB -GARVERSION = 0.36 +GARVERSION = 0.38 CATEGORIES = cpan AUTHOR = PMQS Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2009-03-20 12:34:36 UTC (rev 3840) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2009-03-20 12:54:33 UTC (rev 3841) @@ -1,2 +1,2 @@ 0fbfe55149dc106b82c7c38fdd3601b8 download/CSWpmberkeleydb.gspec -fd54ecfc7d6836d3380e3d33fa440374 download/BerkeleyDB-0.36.tar.gz +33a0c1a9d566a3f5fc71601a165d8335 download/BerkeleyDB-0.38.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Mar 20 14:16:15 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 20 Mar 2009 13:16:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[3842] csw/mgar/pkg/socat/trunk/checksums Message-ID: Revision: 3842 http://gar.svn.sourceforge.net/gar/?rev=3842&view=rev Author: skayser Date: 2009-03-20 13:16:15 +0000 (Fri, 20 Mar 2009) Log Message: ----------- socat: updated checksums Modified Paths: -------------- csw/mgar/pkg/socat/trunk/checksums Modified: csw/mgar/pkg/socat/trunk/checksums =================================================================== --- csw/mgar/pkg/socat/trunk/checksums 2009-03-20 12:54:33 UTC (rev 3841) +++ csw/mgar/pkg/socat/trunk/checksums 2009-03-20 13:16:15 UTC (rev 3842) @@ -1,3 +1,3 @@ 82967132b5a8ca4d07e54370fdcb2662 download/socat-1.7.0.0.tar.gz 06fac9e8c6e979e163630163238296d8 download/cc_compile.patch -04ac1b9432d18d62d43a00e0f73d6449 download/patch-test.diff +0f34e654b9a652278fa2fd1b36d51469 download/patch-test.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 20 15:54:32 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Mar 2009 14:54:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[3843] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 3843 http://gar.svn.sourceforge.net/gar/?rev=3843&view=rev Author: bdwalton Date: 2009-03-20 14:54:32 +0000 (Fri, 20 Mar 2009) Log Message: ----------- Fix another missing dep. Switch to suncc Dynamic gspecs, etc Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-03-20 13:16:15 UTC (rev 3842) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-03-20 14:54:32 UTC (rev 3843) @@ -7,6 +7,7 @@ REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp +REQUIRED_PKGS += CSWggetopt DESCRIPTION = An XSL toolchain front end. define BLURB @@ -17,18 +18,12 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto) TEST_TARGET = check -GARCOMPILER = GNU - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# this ssl site has a cert we don't recognize -WGET_OPTS = --no-check-certificate - pre-configure: @(cd $(WORKSRC); \ touch doc/xmlto.xml doc/xmlif.xml ) Deleted: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend 2009-03-20 13:16:15 UTC (rev 3842) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend 2009-03-20 14:54:32 UTC (rev 3843) @@ -1,12 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs -P CSWxmlcommon xmlcommon - A collection of entities and DTDs -P CSWlibxml2 libxml2 - A library providing XML and HTML support -P CSWdocbookdtds docbookdtds - SGML and XML document type definitions for DocBook. -P CSWdocbookxsl docbookxsl - Norman Walsh's XSL stylesheets for DocBook XML. -P CSWlibxslt libxslt - XSLT engine for the XML Toolkit -P CSWflex flex - A tool for generating text-scanning programs. -P CSWw3m w3m - Text-based web browser - - - Deleted: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2009-03-20 13:16:15 UTC (rev 3842) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2009-03-20 14:54:32 UTC (rev 3843) @@ -1,4 +0,0 @@ -%var bitname xmlto -%var pkgname CSWxmlto -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 20 16:30:34 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 20 Mar 2009 15:30:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3844] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 3844 http://gar.svn.sourceforge.net/gar/?rev=3844&view=rev Author: bdwalton Date: 2009-03-20 15:30:34 +0000 (Fri, 20 Mar 2009) Log Message: ----------- autoconf is a build dep Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-03-20 14:54:32 UTC (rev 3843) +++ csw/mgar/pkg/git/trunk/Makefile 2009-03-20 15:30:34 UTC (rev 3844) @@ -14,6 +14,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs +PREREQUISITE_PKGS += CSWautoconf REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash CSWpmerror This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Fri Mar 20 18:56:00 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Fri, 20 Mar 2009 17:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[3845] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 3845 http://gar.svn.sourceforge.net/gar/?rev=3845&view=rev Author: rmacduff Date: 2009-03-20 17:55:57 +0000 (Fri, 20 Mar 2009) Log Message: ----------- gsed: added EXTRA_MERGE_EXCLUDE_FILES and changed CONFIGURE_ARGS Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2009-03-20 15:30:34 UTC (rev 3844) +++ csw/mgar/pkg/sed/trunk/Makefile 2009-03-20 17:55:57 UTC (rev 3845) @@ -2,6 +2,8 @@ GARVERSION = 4.1.5 CATEGORIES = utils +DEBUG_PACKAGING = 1 + PACKAGES = CSWgsed CATALOGNAME_CSWgsed = gsed @@ -23,12 +25,11 @@ # See http://markmail.org/message/7ki46iiok3ddu3sa GARCOMPILER = GNU -PREREQUISITE_PKGS = CSWiconv +REQUIRED_PKGS = CSWiconv + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw -CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw CONFIGURE_ARGS += --with-included-gettext TEST_TARGET = check @@ -36,4 +37,6 @@ include gar/category.mk # Make sure we are using gnu tools (esp. sed) -PATH := /opt/csw/gnu:$(PATH) \ No newline at end of file +PATH := /opt/csw/gnu:$(PATH) + +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Fri Mar 20 18:57:29 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Fri, 20 Mar 2009 17:57:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[3846] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 3846 http://gar.svn.sourceforge.net/gar/?rev=3846&view=rev Author: rmacduff Date: 2009-03-20 17:57:29 +0000 (Fri, 20 Mar 2009) Log Message: ----------- gsed: removed DEBUG line Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2009-03-20 17:55:57 UTC (rev 3845) +++ csw/mgar/pkg/sed/trunk/Makefile 2009-03-20 17:57:29 UTC (rev 3846) @@ -2,8 +2,6 @@ GARVERSION = 4.1.5 CATEGORIES = utils -DEBUG_PACKAGING = 1 - PACKAGES = CSWgsed CATALOGNAME_CSWgsed = gsed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Mar 20 20:39:48 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 20 Mar 2009 19:39:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3847] csw/mgar/pkg/nagiosp/trunk Message-ID: Revision: 3847 http://gar.svn.sourceforge.net/gar/?rev=3847&view=rev Author: j_arndt Date: 2009-03-20 19:39:47 +0000 (Fri, 20 Mar 2009) Log Message: ----------- nagios_plugins: software name renamed, deleted not needed files Modified Paths: -------------- csw/mgar/pkg/nagiosp/trunk/Makefile csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec Removed Paths: ------------- csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend csw/mgar/pkg/nagiosp/trunk/files/legal.diff csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff Modified: csw/mgar/pkg/nagiosp/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagiosp/trunk/Makefile 2009-03-20 17:57:29 UTC (rev 3846) +++ csw/mgar/pkg/nagiosp/trunk/Makefile 2009-03-20 19:39:47 UTC (rev 3847) @@ -2,7 +2,7 @@ GARVERSION = 1.4.13 CATEGORIES = apps -DESCRIPTION = Plugins for Nagios +DESCRIPTION = plugins for nagios define BLURB Long description endef Deleted: csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend =================================================================== --- csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend 2009-03-20 17:57:29 UTC (rev 3846) +++ csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend 2009-03-20 19:39:47 UTC (rev 3847) @@ -1,10 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library -P CSWjre6 jre6 - Java Development Kit 6 -P CSWlibnet libnet - the libnet packet construction library -P CSWlibpq libpq - libraries needed by postgresql server and clients -P CSWmysql5rt mysql5rt - run-time libraries for mysql5 -P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWsasl sasl - Simple Authentication and Security Layer -P CSWzlib zlib - Zlib Data Compression Library Modified: csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec =================================================================== --- csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec 2009-03-20 17:57:29 UTC (rev 3846) +++ csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec 2009-03-20 19:39:47 UTC (rev 3847) @@ -1,3 +1,3 @@ -%var bitname nagiosp +%var bitname nagios_plugins %var pkgname CSWnagiosp %include url file://%{PKGLIB}/csw_dyndepend.gspec Deleted: csw/mgar/pkg/nagiosp/trunk/files/legal.diff =================================================================== --- csw/mgar/pkg/nagiosp/trunk/files/legal.diff 2009-03-20 17:57:29 UTC (rev 3846) +++ csw/mgar/pkg/nagiosp/trunk/files/legal.diff 2009-03-20 19:39:47 UTC (rev 3847) @@ -1,17 +0,0 @@ -diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/Makefile.in nagios-plugins-1.4.13/Makefile.in ---- nagios-plugins-1.4.13.orig/Makefile.in 2009-02-04 12:38:29.568808276 +0100 -+++ nagios-plugins-1.4.13/Makefile.in 2009-02-04 12:38:15.957832674 +0100 -@@ -1042,6 +1042,13 @@ - $(INSTALL) -d $(DESTDIR)$(docdir) - $(INSTALL) -m 644 contrib.tar $(DESTDIR)$(docdir) - -+INFO_DIST = BUGS ChangeLog FAQ README REQUIREMENTS SUPPORT -+install-legal: -+ $(INSTALL) -d $(DESTDIR)$(docdir) -+ for i in $(INFO_DIST); do \ -+ $(INSTALL) -m 644 $$i $(DESTDIR)$(docdir) ; \ -+ done -+ - - tap: - cd @TAP_DIR@ && $(MAKE) Deleted: csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff =================================================================== --- csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff 2009-03-20 17:57:29 UTC (rev 3846) +++ csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff 2009-03-20 19:39:47 UTC (rev 3847) @@ -1,81 +0,0 @@ -diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-root/Makefile.am nagios-plugins-1.4.13/plugins-root/Makefile.am ---- nagios-plugins-1.4.13.orig/plugins-root/Makefile.am 2008-07-02 22:00:08.000000000 +0200 -+++ nagios-plugins-1.4.13/plugins-root/Makefile.am 2009-02-02 15:04:58.121712871 +0100 -@@ -41,26 +41,18 @@ - chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ - done - --install-root: $(noinst_PROGRAMS) -- @$(INSTALL_SUID) -+install-root: -+ $(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 744 check_dhcp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 744 check_icmp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 744 pst3 $(DESTDIR)$(libexecdir) - --install-exec-local: $(noinst_PROGRAMS) -- @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ -- rm -f $$TMPFILE; \ -- echo > $$TMPFILE; \ -- ## See if we can create a setuid root executable in $(libexecdir). -- ## If not, then don't even try to install setuid plugins. -- can_create_suid_root_executable=no; \ -- chown root $$TMPFILE > /dev/null 2>&1 \ -- && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ -- && can_create_suid_root_executable=yes; \ -- rm -f $$TMPFILE; \ -- if test $$can_create_suid_root_executable = yes; then \ -- $(INSTALL_SUID); \ -- else \ -- echo "WARNING: insufficient access; not installing setuid plugins"; \ -- echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ -- fi -+ -+install-exec-local: -+ $(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 744 check_dhcp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 744 check_icmp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 744 pst3 $(DESTDIR)$(libexecdir) - - # /* Author Coreutils team sub-citation */ - -diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-root/Makefile.in nagios-plugins-1.4.13/plugins-root/Makefile.in ---- nagios-plugins-1.4.13.orig/plugins-root/Makefile.in 2008-09-25 10:33:20.000000000 +0200 -+++ nagios-plugins-1.4.13/plugins-root/Makefile.in 2009-02-02 15:04:14.144038426 +0100 -@@ -952,24 +952,19 @@ - test: - perl -I $(top_builddir) -I $(top_srcdir) ../test.pl - --install-root: $(noinst_PROGRAMS) -- @$(INSTALL_SUID) -+install-root: -+ $(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 644 check_dhcp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 644 check_icmp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 644 pst3 $(DESTDIR)$(libexecdir) - --install-exec-local: $(noinst_PROGRAMS) -- @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ -- rm -f $$TMPFILE; \ -- echo > $$TMPFILE; \ -- can_create_suid_root_executable=no; \ -- chown root $$TMPFILE > /dev/null 2>&1 \ -- && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ -- && can_create_suid_root_executable=yes; \ -- rm -f $$TMPFILE; \ -- if test $$can_create_suid_root_executable = yes; then \ -- $(INSTALL_SUID); \ -- else \ -- echo "WARNING: insufficient access; not installing setuid plugins"; \ -- echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ -- fi -+ -+install-exec-local: -+ $(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 644 check_dhcp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 644 check_icmp $(DESTDIR)$(libexecdir) -+ $(INSTALL) -m 644 pst3 $(DESTDIR)$(libexecdir) -+# - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Mar 20 20:42:18 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 20 Mar 2009 19:42:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[3848] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 3848 http://gar.svn.sourceforge.net/gar/?rev=3848&view=rev Author: j_arndt Date: 2009-03-20 19:42:17 +0000 (Fri, 20 Mar 2009) Log Message: ----------- nrpe: changed package description, renamed software from nrpeplugin to nrpe_plugin Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-20 19:39:47 UTC (rev 3847) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-03-20 19:42:17 UTC (rev 3848) @@ -2,8 +2,8 @@ GARVERSION = 2.12 CATEGORIES = apps -SPKG_DESC_CSWnrpe = nagios remote plugin executor (server files, client package is nrpeplugin) -SPKG_DESC_CSWnrpeplugin = nagios remote plugin executor (client files, server package is nrpe) +SPKG_DESC_CSWnrpe = nagios remote plugin executor +SPKG_DESC_CSWnrpeplugin = nagios plugin that connects to nrpe demon define BLURB NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec 2009-03-20 19:39:47 UTC (rev 3847) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec 2009-03-20 19:42:17 UTC (rev 3848) @@ -1,3 +1,3 @@ -%var bitname nrpeplugin +%var bitname nrpe_plugin %var pkgname CSWnrpeplugin %include url file://%{PKGLIB}/csw_dyndepend.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Mar 20 20:44:59 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 20 Mar 2009 19:44:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[3849] csw/mgar/pkg/nsca/trunk/Makefile Message-ID: Revision: 3849 http://gar.svn.sourceforge.net/gar/?rev=3849&view=rev Author: j_arndt Date: 2009-03-20 19:44:56 +0000 (Fri, 20 Mar 2009) Log Message: ----------- nsca: changed package description Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-20 19:42:17 UTC (rev 3848) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-20 19:44:56 UTC (rev 3849) @@ -2,8 +2,8 @@ GARVERSION = 2.7.2 CATEGORIES = apps -SPKG_DESC_CSWnsca = Nagios service check acceptor - nagios server files only (the client package is send_nsca) -SPKG_DESC_CSWsendnsca = Nagios service check acceptor - client files only (the server package is nsca) +SPKG_DESC_CSWnsca = nagios service check acceptor +SPKG_DESC_CSWsendnsca = sends check results to nsca daemon define BLURB NSCA allows you to integrate passive alerts and checks from remote machines and applications with Nagios. Useful for processing security alerts, as well as redundant and distributed Nagios setups. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Mar 20 21:55:05 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 20 Mar 2009 20:55:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[3850] csw/mgar/pkg/nagiosp/trunk/checksums Message-ID: Revision: 3850 http://gar.svn.sourceforge.net/gar/?rev=3850&view=rev Author: j_arndt Date: 2009-03-20 20:55:05 +0000 (Fri, 20 Mar 2009) Log Message: ----------- nagios_plugins: updated checksums Modified Paths: -------------- csw/mgar/pkg/nagiosp/trunk/checksums Modified: csw/mgar/pkg/nagiosp/trunk/checksums =================================================================== --- csw/mgar/pkg/nagiosp/trunk/checksums 2009-03-20 19:44:56 UTC (rev 3849) +++ csw/mgar/pkg/nagiosp/trunk/checksums 2009-03-20 20:55:05 UTC (rev 3850) @@ -1,3 +1,3 @@ be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz -abfb8a44032960e6bc446a5ae5ebeafd download/CSWnagiosp.gspec +61f490e92b603ac8628fb0c6cebb39ce download/CSWnagiosp.gspec 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Mar 20 21:55:30 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 20 Mar 2009 20:55:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[3851] csw/mgar/pkg/nrpe/trunk/checksums Message-ID: Revision: 3851 http://gar.svn.sourceforge.net/gar/?rev=3851&view=rev Author: j_arndt Date: 2009-03-20 20:55:29 +0000 (Fri, 20 Mar 2009) Log Message: ----------- nrpe: updated checksums Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/checksums Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-03-20 20:55:05 UTC (rev 3850) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-03-20 20:55:29 UTC (rev 3851) @@ -5,7 +5,7 @@ 53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall 393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove cbfc86ba77e78e2f860f90a303a1abe5 download/cswnrpe -5eaf5f95a021fc9bf55ac80c87fcb243 download/CSWnrpeplugin.gspec +2b35d5e0d57bcb3aff096040e0d06b8b download/CSWnrpeplugin.gspec e22a7817c7665e79bcbad7e091375be9 download/CSWnrpeplugin.prototype 5b02d4385daaea2a8c13903539aa6189 download/patch.diff 4b51476c782d2c5764d10f8ed530ada0 download/configure.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ggunselm at emporia.edu Sat Mar 21 01:52:08 2009 From: ggunselm at emporia.edu (Glen Gunselman) Date: Fri, 20 Mar 2009 19:52:08 -0500 Subject: [csw-devel] Orca and friends packages In-Reply-To: <91D22A54-32E7-40FF-A6D1-BE3252D91D92@opencsw.org> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> <49BFE579.CC54.005D.3@emporia.edu> <91D22A54-32E7-40FF-A6D1-BE3252D91D92@opencsw.org> Message-ID: <49C3F3E8.CC54.005D.3@emporia.edu> Dago, Maybe I'm getting the horse ahead of the cart, or I just do not understand what's involved in using the packages from http://mirror.opencsw.org/opencsw/testing but I tried the following command: /opt/csw/bin/pkg-get -s http://mirror.opencsw.org/opencsw/testing -U -u orca and received the following output: WARNING: gpg not found Getting catalog... --19:17:51-- http://mirror.opencsw.org/opencsw/testing/sparc/5.10/catalog => `catalog' Resolving mirror.opencsw.org... 213.178.77.176 Connecting to mirror.opencsw.org|213.178.77.176|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 28,937 (28K) [text/plain] 100%[====================================>] 28,937 35.11K/s 19:17:56 (35.02 KB/s) - `catalog' saved [28937/28937] Updating catalog file /var/pkg-get/catalog-mirror.opencsw.org updated --19:17:56-- http://mirror.opencsw.org/opencsw/testing/sparc/5.10/descriptions => `descriptions' Resolving mirror.opencsw.org... 213.178.77.176 Connecting to mirror.opencsw.org|213.178.77.176|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 6,949 (6.8K) [text/plain] 100%[====================================>] 6,949 38.92K/s 19:17:56 (38.71 KB/s) - `descriptions' saved [6949/6949] Updated description file INTERNAL ERROR: cannot get remote version for CSWcswclassutils Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWsetoolkit Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWperl Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWpmtimedate Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWpmmathinterpolate Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWgawk Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWbzip2 Perhaps your catalog is out of date INTERNAL ERROR: cannot get remote version for CSWcommon Perhaps your catalog is out of date No existing install of CSWorca found. Installing... Trying http://mirror.opencsw.org/opencsw/testing/sparc/5.10/orca-r535,REV=2009.03.19-SunOS5.8-sparc-CSW.pkg.gz --19:17:57-- http://mirror.opencsw.org/opencsw/testing/sparc/5.10/orca-r535,REV=2009.03.19-SunOS5.8-sparc-CSW.pkg.gz => `orca-r535,REV=2009.03.19-SunOS5.8-sparc-CSW.pkg.gz' Resolving mirror.opencsw.org... 213.178.77.176 Connecting to mirror.opencsw.org|213.178.77.176|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 151,902 (148K) [application/x-gzip] 100%[====================================>] 151,902 124.15K/s 19:17:58 (123.78 KB/s) - `orca-r535,REV=2009.03.19-SunOS5.8-sparc-CSW.pkg.gz' saved [151902/151902] Analysing special files... ERROR: no info for CSWcswclassutils. Cannot install dependancy. ERROR: could not install required dependancies for CSWorca Once dependancies are up to date, call /opt/csw/bin/pkg-get -i orca to (re)install Is this a symptom of using "test packages" and I need to manually install the dependancies, or have I missed a step or two, or is there some work on your end that I need to wait for? have a good weekend, Glen Gunselman Systems Software Specialist TCS Emporia State University >>> Dagobert Michelsen 3/19/2009 8:32 AM >>> Hi Glen, Am 18.03.2009 um 00:01 schrieb Glen Gunselman: I know a little about using Orca but very little about installing it. I will have an LDom on a T5220 to test on running Solaris 10 5/08. If you could provide some "how-to" that would really help. I'll be writing this in the next few days at http://wiki.opencsw.org/orca-package Please be advised that it is not ready yet and CSWorca is not yet released. Best regards -- Dago -------------- next part -------------- An HTML attachment was scrubbed... URL: From bonivart at opencsw.org Sat Mar 21 02:21:50 2009 From: bonivart at opencsw.org (Peter Bonivart) Date: Sat, 21 Mar 2009 02:21:50 +0100 Subject: [csw-devel] Orca and friends packages In-Reply-To: <49C3F3E8.CC54.005D.3@emporia.edu> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> <49BFE579.CC54.005D.3@emporia.edu> <91D22A54-32E7-40FF-A6D1-BE3252D91D92@opencsw.org> <49C3F3E8.CC54.005D.3@emporia.edu> Message-ID: <625385e30903201821y4f2e219o772856b94a260f86@mail.gmail.com> 2009/3/21 Glen Gunselman : > Is this a symptom of using "test packages" and I need to manually install > the dependancies, or?have?I missed a step or two, or is there some work on > your end that?I need to wait for? There's another way of installing mentioned on that page: pkgutil -t http://mirror.opencsw.org/opencsw/testing/`uname -p`/`uname -r` -i Have you tried that? -- /peter From chninkel at users.sourceforge.net Sat Mar 21 13:42:21 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Mar 2009 12:42:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[3852] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 3852 http://gar.svn.sourceforge.net/gar/?rev=3852&view=rev Author: chninkel Date: 2009-03-21 12:42:21 +0000 (Sat, 21 Mar 2009) Log Message: ----------- lftp: updated to 3.7.11 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/CSWlftp.depend csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2009-03-20 20:55:29 UTC (rev 3851) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-03-21 12:42:21 UTC (rev 3852) @@ -1,5 +1,5 @@ GARNAME = lftp -GARVERSION = 3.7.8 +GARVERSION = 3.7.11 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-03-20 20:55:29 UTC (rev 3851) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-03-21 12:42:21 UTC (rev 3852) @@ -1,7 +1,7 @@ -014a4ac6b9ea4016d5cd64afe0397b89 download/lftp-3.7.8.tar.gz +6fe8793f3ccde1d2f8446d599d8a69a9 download/lftp-3.7.11.tar.gz 47fdb80e4575a9a70d69b146974620df download/CSWlftp.gspec 96ee1569832d5eaed0c3a7b37e13fc88 download/CSWlftp.prototype -f2c7e3e3db9f5c48dddb983c95588528 download/CSWlftp.depend -f1eeec4e93ff6e52c685603708f3407c download/changelog.CSW +1d5c0baad924f093fec94a1e460cb487 download/CSWlftp.depend +a2cbdf2a8ee503443432fbe82819773a download/changelog.CSW 3a01fb949dfe799507720c311222cd96 download/i.conf 51abe2144219c1af4c79c2e8b7e81cb9 download/r.conf Modified: csw/mgar/pkg/lftp/trunk/files/CSWlftp.depend =================================================================== --- csw/mgar/pkg/lftp/trunk/files/CSWlftp.depend 2009-03-20 20:55:29 UTC (rev 3851) +++ csw/mgar/pkg/lftp/trunk/files/CSWlftp.depend 2009-03-21 12:42:21 UTC (rev 3852) @@ -1,5 +1,5 @@ P CSWexpat expat - XML Parser Toolkit -P CSWggettext ggettext - GNU gettext +P CSWggettextrt ggettextrt - GNU gettext P CSWiconv libiconv - GNU iconv library P CSWosslrt openssl - The Open Source toolkit for SSL and TLS. P CSWreadline readline - library to enable interactive line editing Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-03-20 20:55:29 UTC (rev 3851) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-03-21 12:42:21 UTC (rev 3852) @@ -1,3 +1,16 @@ +lftp (3.7.11,REV=2009.03.21) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 + +lftp (3.7.8,REV=2009.02.15) unstable + + * Changed gettext dependancy to follow gettext package split + (Closes: #3099). + + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + lftp (3.7.8,REV=2009.01.24) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 21 13:54:27 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Mar 2009 12:54:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[3853] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 3853 http://gar.svn.sourceforge.net/gar/?rev=3853&view=rev Author: chninkel Date: 2009-03-21 12:54:27 +0000 (Sat, 21 Mar 2009) Log Message: ----------- vsftpd: updated to 2.1.0 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-03-21 12:42:21 UTC (rev 3852) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-03-21 12:54:27 UTC (rev 3853) @@ -4,7 +4,7 @@ a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall 81319e5dd110b08a476c3b31af2fd573 download/CSWvsftpd.depend 314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config -838312681cf471ed70f4f973ae5ccab7 download/changelog.CSW +68178673c7d33baead2d7b97e878ed79 download/changelog.CSW eeaf77528b2da0c7730323838f30b7ef download/README.CSW f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf 60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-03-21 12:42:21 UTC (rev 3852) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2009-03-21 12:54:27 UTC (rev 3853) @@ -1,3 +1,9 @@ +vsftpd (2.1.0,REV=2009.03.21) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 + vsftpd (2.0.7,REV=2008.11.30) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 21 13:55:16 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Mar 2009 12:55:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[3854] csw/mgar/pkg/bash/trunk Message-ID: Revision: 3854 http://gar.svn.sourceforge.net/gar/?rev=3854&view=rev Author: chninkel Date: 2009-03-21 12:55:15 +0000 (Sat, 21 Mar 2009) Log Message: ----------- bash: updated to patch level 10 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-03-21 12:54:27 UTC (rev 3853) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-03-21 12:55:15 UTC (rev 3854) @@ -1,6 +1,6 @@ GARNAME = bash GARVERSION = 4.0 -PATCHLEVEL = 0 +PATCHLEVEL = 10 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-03-21 12:54:27 UTC (rev 3853) +++ csw/mgar/pkg/bash/trunk/checksums 2009-03-21 12:55:15 UTC (rev 3854) @@ -4,5 +4,15 @@ bcc9760316385d49ff31c2ed72f4be4a download/CSWbash.postinstall 589297e4f9a43d0c82632e99423db7ef download/CSWbash.postremove 293cc64a948ea3d49010ae6e58122b52 download/CSWbash.depend -ffafd87364c3a6c2709e6a5f4ae7311a download/changelog.CSW +a4c85be596685b1d7bdc469d17472f5f download/changelog.CSW +bc7f4762443939bd7dccb42370f0d932 download/bash40-001 +c2a4a4786a83ed4ec366c6a8924369a2 download/bash40-002 +22e8a824eddba21a8fce10d7984c2aba download/bash40-003 +ed7cbced8c7c964323265522369a37a2 download/bash40-004 +8ed86b7d31423d71ecf3148251d63512 download/bash40-005 +5f447338cb98ff156cabf1fd9879d5f3 download/bash40-006 +96e946cb66a4ca186cba1da44f1ee163 download/bash40-007 +d3eb7b6f00d525e032478c33f51d46a8 download/bash40-008 +340601c997ce569532417a7ae92248b8 download/bash40-009 +0bd5ab96d514ffb1afbb8c7984b15146 download/bash40-010 29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-03-21 12:54:27 UTC (rev 3853) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-03-21 12:55:15 UTC (rev 3854) @@ -1,5 +1,11 @@ -bash (4.0,REV=2009.02.21) unstable +bash (4.0,REV=2009.03.21) unstable + * Added bash patches bash40-001 to bash40-010. + + -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 + +bash (4.0,REV=2009.02.21) unstable + * New upstream release. -- Yann Rouillard Sat, 21 Feb 2009 16:58:45 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Mar 21 18:30:33 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Mar 2009 17:30:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[3855] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 3855 http://gar.svn.sourceforge.net/gar/?rev=3855&view=rev Author: chninkel Date: 2009-03-21 17:30:32 +0000 (Sat, 21 Mar 2009) Log Message: ----------- openssh: updated to 5.2p1 openssh: split the ssh client in a separate package Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWossh.depend csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype csw/mgar/pkg/openssh/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/cyrus.conf csw/mgar/pkg/openssh/trunk/files/imapd.conf csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,5 +1,5 @@ GARNAME = openssh -GARVERSION = 5.1 +GARVERSION = 5.2 RELEASE = p1 GSSKEX_PATCH_VERSION = $(GARVERSION)$(RELEASE) GSSKEX_PATCH_DATE = 20081003 @@ -25,19 +25,20 @@ DISTNAME = $(GARNAME)-$(DISTVERSION) DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES += i.conf r.conf +DISTFILES += changelog.CSW DISTFILES += $(call admfiles,CSWossh,depend checkinstall preinstall postinstall prototype) -DISTFILES += changelog.CSW DISTFILES += sshd_config DISTFILES += cswopenssh svc-cswopenssh cswopenssh.xml -DISTFILES += i.conf r.conf DISTFILES += openssh +DISTFILES += $(call admfiles,CSWosshclient,depend prototype) # Script created to workaround a upgrade bug between # package = 4.6,REV=2007.07.30_rev=p1 and later package DISTFILES += openssh_restart_workaround.sh +# The GSSAPI key exchange patch PATCHDIRLEVEL = 0 -# The GSSAPI key exchange patch PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-$(GSSKEX_PATCH_DATE).patch # Prevent TIOCSCTTY from being used to avoid error: @@ -73,8 +74,9 @@ # adding documentation files post-install: - mkdir -p $(DESTDIR)/$(docdir)/openssh/ + mkdir -p $(DESTDIR)/$(docdir)/openssh/ $(DESTDIR)/$(docdir)/openssh_client/ cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh/ + cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh_client/ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,19 +1,22 @@ -03f2d0c1b5ec60d4ac9997a146d2faec download/openssh-5.1p1.tar.gz +ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz +dc212745af1f549ce2a236401bf97c1b download/i.conf +5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf +2ace8f24d32978fb8d550a1648483d5f download/changelog.CSW d1c2c49bcd3b65a601946e8316b0b018 download/CSWossh.gspec -a85143ec7bc4aeb7a444f591be5ef439 download/CSWossh.depend +6e91d098018d7e1855b626ea463b8a29 download/CSWossh.depend 1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall e9e93bfda8a883bca632c712d9c359f6 download/CSWossh.postinstall -25f7a58f2a19feb40811e9d7df5bca26 download/CSWossh.prototype -7614576845be17fc3ee2f6fea7b83695 download/changelog.CSW +0251175f92d2ec655f033cfdf58aa0d8 download/CSWossh.prototype 0c7fca2f4bee3ecd489ebd85fdd8cdee download/sshd_config 73416a82ca98ba40e7b86ea94d0339cf download/cswopenssh 8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh 547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml -dc212745af1f549ce2a236401bf97c1b download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf fd50a65230ec1ead7949e8500844b0bf download/openssh +17fca1c009ef012c158b7051dd0f2b5a download/CSWosshclient.gspec +1055c346c01d99d09572d978fad10256 download/CSWosshclient.depend +3446a3185dddc9a63b28c588685c629e download/CSWosshclient.prototype bd0f690fbb3abcbffe7924ae3016c8c3 download/openssh_restart_workaround.sh -48c42896b94afb1126050647b6442751 download/openssh-5.1p1-gsskex-20081003.patch +05420ca20fada7ec02bd9474701abc4b download/openssh-5.2p1-gsskex-20081003.patch 04da9aaea49aa4b026f156a48e577a19 download/don_t_use_TIOCSCTTY.patch 38a20d4c63ada0a7a68226cf5e8af9c5 download/no_x_forwarding_bug.patch Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.depend =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWossh.depend 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/files/CSWossh.depend 2009-03-21 17:30:32 UTC (rev 3855) @@ -2,3 +2,4 @@ P CSWtcpwrap P CSWzlib P CSWkrb5lib +P CSWosshclient Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,20 +1,10 @@ i i.conf=i.conf i r.conf=r.conf f none /etc/init.d/openssh=openssh 0755 root bin -f none /opt/csw/bin/scp 0755 root bin -f none /opt/csw/bin/sftp 0755 root bin -s none /opt/csw/bin/slogin=./ssh -f none /opt/csw/bin/ssh 0755 root bin -f none /opt/csw/bin/ssh-add 0755 root bin -f none /opt/csw/bin/ssh-agent 0755 root bin -f none /opt/csw/bin/ssh-keygen 0755 root bin -f none /opt/csw/bin/ssh-keyscan 0755 root bin -e conf /opt/csw/etc/ssh/moduli 0644 root bin -e conf /opt/csw/etc/ssh/ssh_config 0644 root bin f none /opt/csw/etc/ssh/sshd_config.CSW=sshd_config 0744 root bin +e conf /opt/csw/etc/ssh/moduli 0644 root bin d none /opt/csw/libexec 0755 root bin f none /opt/csw/libexec/sftp-server 0755 root bin -f none /opt/csw/libexec/ssh-keysign 4711 root bin f none /opt/csw/sbin/sshd 0755 root bin f none /opt/csw/share/Ssh.bin 0644 root bin d none /opt/csw/share/doc/openssh 0755 root bin @@ -33,18 +23,8 @@ f none /opt/csw/share/doc/openssh/README.tun 0644 root bin f none /opt/csw/share/doc/openssh/TODO 0644 root bin f none /opt/csw/share/doc/openssh/WARNING.RNG 0644 root bin -f none /opt/csw/share/man/man1/scp.1 0644 root bin -f none /opt/csw/share/man/man1/sftp.1 0644 root bin -s none /opt/csw/share/man/man1/slogin.1=./ssh.1 -f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin -f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin -f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin -f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin -f none /opt/csw/share/man/man1/ssh.1 0644 root bin -f none /opt/csw/share/man/man5/ssh_config.5 0644 root bin f none /opt/csw/share/man/man5/sshd_config.5 0644 root bin f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin -f none /opt/csw/share/man/man8/ssh-keysign.8 0644 root bin f none /opt/csw/share/man/man8/sshd.8 0644 root bin d none /opt/csw/share/openssh 0755 root bin f none /opt/csw/share/openssh/openssh_restart_workaround.sh=openssh_restart_workaround.sh 0755 root bin Added: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend 2009-03-21 17:30:32 UTC (rev 3855) @@ -0,0 +1,3 @@ +P CSWosslrt +P CSWzlib +P CSWkrb5lib Added: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec 2009-03-21 17:30:32 UTC (rev 3855) @@ -0,0 +1,4 @@ +%var bitname openssh_client +%var pkgname CSWosshclient +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENCE Added: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2009-03-21 17:30:32 UTC (rev 3855) @@ -0,0 +1,39 @@ +i i.conf=i.conf +i r.conf=r.conf +f none /opt/csw/bin/scp 0755 root bin +f none /opt/csw/bin/sftp 0755 root bin +s none /opt/csw/bin/slogin=./ssh +f none /opt/csw/bin/ssh 0755 root bin +f none /opt/csw/bin/ssh-add 0755 root bin +f none /opt/csw/bin/ssh-agent 0755 root bin +f none /opt/csw/bin/ssh-keygen 0755 root bin +f none /opt/csw/bin/ssh-keyscan 0755 root bin +e conf /opt/csw/etc/ssh/ssh_config 0644 root bin +d none /opt/csw/libexec 0755 root bin +f none /opt/csw/libexec/ssh-keysign 4711 root bin +d none /opt/csw/share/doc/openssh_client 0755 root bin +f none /opt/csw/share/doc/openssh_client/changelog.CSW=changelog.CSW 0644 root bin +f none /opt/csw/share/doc/openssh_client/CREDITS 0644 root bin +f none /opt/csw/share/doc/openssh_client/ChangeLog 0644 root bin +f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin +f none /opt/csw/share/doc/openssh_client/INSTALL 0644 root bin +f none /opt/csw/share/doc/openssh_client/LICENCE 0644 root bin +f none /opt/csw/share/doc/openssh_client/OVERVIEW 0644 root bin +f none /opt/csw/share/doc/openssh_client/README 0644 root bin +f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin +f none /opt/csw/share/doc/openssh_client/README.platform 0644 root bin +f none /opt/csw/share/doc/openssh_client/README.privsep 0644 root bin +f none /opt/csw/share/doc/openssh_client/README.smartcard 0644 root bin +f none /opt/csw/share/doc/openssh_client/README.tun 0644 root bin +f none /opt/csw/share/doc/openssh_client/TODO 0644 root bin +f none /opt/csw/share/doc/openssh_client/WARNING.RNG 0644 root bin +f none /opt/csw/share/man/man1/scp.1 0644 root bin +f none /opt/csw/share/man/man1/sftp.1 0644 root bin +s none /opt/csw/share/man/man1/slogin.1=./ssh.1 +f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin +f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin +f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin +f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin +f none /opt/csw/share/man/man1/ssh.1 0644 root bin +f none /opt/csw/share/man/man5/ssh_config.5 0644 root bin +f none /opt/csw/share/man/man8/ssh-keysign.8 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,3 +1,9 @@ +openssh (5.1,REV=2008.02.15_rev=p1) unstable + + * Package rebuild to solve incorrect package push in repository tree. + + -- Yann Rouillard Sat, 06 Dec 2008 15:36:48 +0100 + openssh (5.1,REV=2008.12.06_rev=p1) unstable * Added test for configuration file existence in sysV init script Deleted: csw/mgar/pkg/openssh/trunk/files/cyrus.conf =================================================================== --- csw/mgar/pkg/openssh/trunk/files/cyrus.conf 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/files/cyrus.conf 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,42 +0,0 @@ -# standard standalone server implementation - -START { - # do not delete this entry! - recover cmd="/opt/csw/sbin/ctl_cyrusdb -r" - - # this is only necessary if using idled for IMAP IDLE -# idled cmd="idled" -} - -# UNIX sockets start with a slash and are put into /var/imap/sockets -SERVICES { - # add or remove based on preferences - imap cmd="imapd" listen="imap" prefork=5 -# imaps cmd="imapd -s" listen="imaps" prefork=1 - pop3 cmd="pop3d" listen="pop3" prefork=3 -# pop3s cmd="pop3d -s" listen="pop3s" prefork=1 - sieve cmd="timsieved" listen="sieve" prefork=0 - - # these are only necessary if receiving/exporting usenet via NNTP -# nntp cmd="nntpd" listen="nntp" prefork=3 -# nntps cmd="nntpd -s" listen="nntps" prefork=1 - - # at least one LMTP is required for delivery -# lmtp cmd="lmtpd" listen="lmtp" prefork=0 - lmtpunix cmd="lmtpd" listen="/opt/csw/var/cyrus/config/socket/lmtp" prefork=1 - - # this is only necessary if using notifications -# notify cmd="notifyd" listen="/opt/csw/var/cyrus/config/socket/notify" proto="udp" prefork=1 -} - -EVENTS { - # this is required - checkpoint cmd="/opt/csw/sbin/ctl_cyrusdb -c" period=30 - - # this is only necessary if using duplicate delivery suppression, - # Sieve or NNTP - delprune cmd="/opt/csw/sbin/cyr_expire -E 3" at=0400 - - # this is only necessary if caching TLS sessions - tlsprune cmd="/opt/csw/sbin/tls_prune" at=0400 -} Deleted: csw/mgar/pkg/openssh/trunk/files/imapd.conf =================================================================== --- csw/mgar/pkg/openssh/trunk/files/imapd.conf 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/files/imapd.conf 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,63 +0,0 @@ -# The path where cyrus store its database files for -# mailboxes list, seen states, folder subscription lists, ... -configdirectory: /opt/csw/var/cyrus/config - -# The path where cyrus will store inboxes and folders -partition-default: /opt/csw/var/cyrus/mail - -# The path where cyrus store sieve filters -sievedir: /opt/csw/var/cyrus/sieve - -# Names of admins user who will have right to delete and -# change acls of any mailboxes -admins: cyrus - -# Put "yes" if you prefer to use "/" as the folder separator -# useful if you need to use "." in folder names -unixhierarchysep: no - -# Put "yes" here if you prefer user folders to be on the same -# level with INBOX instead of being subfolders of INBOX. -# useful if you migrate from uw imap -altnamespace: no - -# Cyrus respect RFC 822 which prohibits 8 bits characters in headers. -# By default cyrus will replace them with the "X" character. -# As many bad MUA send this kind of messages, you cant put "no" here -# if you want Cyrus to leave these characters untouched. -# Note this will make IMAP SEARCH not work for these messages. -munge8bit: yes - -# The sasl mechanism to use to authenticate user. -# The possible values are: saslauthd, pwcheck and auxprop -sasl_pwcheck_method: saslauthd - -# Authentication mechanism to use, if you use saslauthd with -# local user, you will have to enable plaintext only mechanism -# i.e PLAIN and LOGIN -# sasl_mech_list: PLAIN LOGIN - -# group checking can cause performance problems; uncomment to disable if groups are not needed -# unix_group_enable:0 - -# If this field is nonzero, inbox folder is automatically created -# when a user successfully authenticate. -# Its quota will be initialized with this value, put -1 here -# if you want automatic inbox creation with unlimlited quota -# autocreatequota: -1 - -# Put "yes" here and set autocreatequota to a nonzero value -# if you want INBOX to be automatically created when an email -# is received -# createonpost: yes - -# Certificate to use for TLS/SSL with all services -# You can use imaps_tls_cert_file, pop3_tls_cert_file, imaps_tls_cert_file ... if you need -# to use a different certificate file for each service. -# tls_cert_file: disabled - -# Private key belonging to the certificate to use for TLS/SSL with all services -# You can use imaps_tls_key_file, pop3_tls_key_file, imaps_tls_key_file ... if you need -# to use a different key file for each service. -# tls_key_file: disabled -# Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch 2009-03-21 12:55:15 UTC (rev 3854) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.1p1-gsskex-20081003.patch 2009-03-21 17:30:32 UTC (rev 3855) @@ -1,2164 +0,0 @@ -diff --speed-large-files --minimal -Nru ChangeLog.gssapi ChangeLog.gssapi ---- ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200 -@@ -0,0 +1,75 @@ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff --speed-large-files --minimal -Nru Makefile.in Makefile.in ---- Makefile.in 2008-07-08 16:21:12.000000000 +0200 -+++ Makefile.in 2008-10-03 21:03:11.502437600 +0200 -@@ -71,7 +71,7 @@ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ -- entropy.o scard-opensc.o gss-genr.o umac.o -+ entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o -@@ -84,7 +84,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o - -diff --speed-large-files --minimal -Nru auth-krb5.c auth-krb5.c ---- auth-krb5.c 2006-08-05 04:39:39.000000000 +0200 -+++ auth-krb5.c 2008-10-03 21:03:11.515772200 +0200 -@@ -166,8 +166,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -219,15 +224,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - umask(old_umask); -@@ -242,6 +254,7 @@ - return errno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -diff --speed-large-files --minimal -Nru auth.h auth.h ---- auth.h 2008-07-02 14:37:30.000000000 +0200 -+++ auth.h 2008-10-03 21:03:11.527360800 +0200 -@@ -53,6 +53,7 @@ - int valid; /* user exists and is allowed to login */ - int attempt; - int failures; -+ int server_caused_failure; - int force_pwchange; - char *user; /* username sent by the client */ - char *service; -diff --speed-large-files --minimal -Nru auth2-gss.c auth2-gss.c ---- auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ auth2-gss.c 2008-10-03 21:03:11.539510000 +0200 -@@ -52,6 +52,39 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -102,6 +135,7 @@ - - if (!present) { - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -109,6 +143,7 @@ - if (ctxt != NULL) - ssh_gssapi_delete_ctx(&ctxt); - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -292,6 +327,12 @@ - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, -diff --speed-large-files --minimal -Nru auth2.c auth2.c ---- auth2.c 2008-07-05 01:44:53.000000000 +0200 -+++ auth2.c 2008-10-03 21:03:53.828669000 +0200 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - -@@ -76,6 +77,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - &method_passwd, -@@ -264,6 +266,7 @@ - #endif - - authctxt->postponed = 0; -+ authctxt->server_caused_failure = 0; - - /* try to authenticate user */ - m = authmethod_lookup(method); -@@ -338,7 +341,9 @@ - /* Allow initial try of "none" auth without failure penalty */ - if (authctxt->attempt > 1 || strcmp(method, "none") != 0) - authctxt->failures++; -- if (authctxt->failures >= options.max_authtries) { -+ /* Dont count server configuration issues against the client */ -+ if (!authctxt->server_caused_failure && -+ authctxt->failures++ > options.max_authtries) { - #ifdef SSH_AUDIT_EVENTS - PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); - #endif -diff --speed-large-files --minimal -Nru configure.ac configure.ac ---- configure.ac 2008-07-09 13:07:19.000000000 +0200 -+++ configure.ac 2008-10-03 21:03:11.603043400 +0200 -@@ -473,6 +473,30 @@ - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE(SSH_TUN_PREPEND_AF, 1, - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow(AU_IPv) - AC_CHECK_DECL(AU_IPv4, [], - AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) -diff --speed-large-files --minimal -Nru gss-genr.c gss-genr.c ---- gss-genr.c 2007-06-12 15:44:36.000000000 +0200 -+++ gss-genr.c 2008-10-03 21:03:11.633999400 +0200 -@@ -39,12 +39,160 @@ - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ gss_indicate_mechs(&min_status, &gss_supported); -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *data) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), data)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -229,6 +377,9 @@ - OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +387,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -254,6 +418,10 @@ - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -272,7 +440,7 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); -diff --speed-large-files --minimal -Nru gss-serv-krb5.c gss-serv-krb5.c ---- gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 -+++ gss-serv-krb5.c 2008-10-03 21:03:11.653344000 +0200 -@@ -120,6 +120,7 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -diff --speed-large-files --minimal -Nru gss-serv.c gss-serv.c ---- gss-serv.c 2008-05-19 07:05:07.000000000 +0200 -+++ gss-serv.c 2008-10-03 21:03:11.676150400 +0200 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2008 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -45,8 +45,12 @@ - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -@@ -81,25 +85,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } -+ -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +125,28 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -352,14 +385,4 @@ - return (0); - } - --/* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) --{ -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -- -- return (ctx->major); --} -- - #endif -diff --speed-large-files --minimal -Nru kex.c kex.c ---- kex.c 2007-06-05 10:30:18.000000000 +0200 -+++ kex.c 2008-10-03 21:03:11.691687000 +0200 -@@ -49,6 +49,10 @@ - #include "dispatch.h" - #include "monitor.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #define KEX_COOKIE_LEN 16 - - #if OPENSSL_VERSION_NUMBER >= 0x00907000L -@@ -327,6 +331,20 @@ - k->kex_type = KEX_DH_GEX_SHA256; - k->evp_md = evp_ssh_sha256(); - #endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); -+#endif - } else - fatal("bad kex alg %s", k->name); - } -diff --speed-large-files --minimal -Nru kex.h kex.h ---- kex.h 2007-06-11 06:01:42.000000000 +0200 -+++ kex.h 2008-10-03 21:03:11.704292200 +0200 -@@ -64,6 +64,9 @@ - KEX_DH_GRP14_SHA1, - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -119,6 +122,11 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -141,6 +149,11 @@ - void kexgex_client(Kex *); - void kexgex_server(Kex *); - -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif -+ - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); -diff --speed-large-files --minimal -Nru kexgssc.c kexgssc.c ---- kexgssc.c 1970-01-01 01:00:00.000000000 +0100 -+++ kexgssc.c 2008-10-03 21:03:11.716704800 +0200 -@@ -0,0 +1,319 @@ -+/* -+ * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ -+ shared_secret = BN_new(); -+ BN_bin2bn(kbuf,kout, shared_secret); -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ serverhostkey, slen, /* server host key */ -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ serverhostkey, slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru kexgsss.c kexgsss.c ---- kexgsss.c 1970-01-01 01:00:00.000000000 +0100 -+++ kexgsss.c 2008-10-03 21:03:11.727451400 +0200 -@@ -0,0 +1,271 @@ -+/* -+ * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ ssh_gssapi_server_mechanisms(); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ -+ shared_secret = BN_new(); -+ BN_bin2bn(kbuf, kout, shared_secret); -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+#endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru key.c key.c ---- key.c 2008-07-11 09:35:09.000000000 +0200 -+++ key.c 2008-10-03 21:03:11.748790400 +0200 -@@ -763,6 +763,8 @@ - return KEY_RSA; - } else if (strcmp(name, "ssh-dss") == 0) { - return KEY_DSA; -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; - } - debug2("key_type_from_name: unknown key type '%s'", name); - return KEY_UNSPEC; -diff --speed-large-files --minimal -Nru key.h key.h ---- key.h 2008-06-12 20:40:35.000000000 +0200 -+++ key.h 2008-10-03 21:03:11.761785800 +0200 -@@ -34,6 +34,7 @@ - KEY_RSA1, - KEY_RSA, - KEY_DSA, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -diff --speed-large-files --minimal -Nru monitor.c monitor.c ---- monitor.c 2008-07-11 09:36:48.000000000 +0200 -+++ monitor.c 2008-10-03 21:03:11.786820800 +0200 -@@ -164,6 +164,7 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -233,11 +234,17 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - {0, 0, NULL} - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -342,6 +349,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -419,6 +430,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1675,6 +1690,11 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1918,6 +1938,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1968,4 +1989,42 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ return (0); -+} -+ - #endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru monitor.h monitor.h ---- monitor.h 2006-03-26 05:30:02.000000000 +0200 -+++ monitor.h 2008-10-03 21:03:11.805411200 +0200 -@@ -53,6 +53,7 @@ - MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, - MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, - MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC, -+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN, - MONITOR_REQ_PAM_START, - MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, - MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, -diff --speed-large-files --minimal -Nru monitor_wrap.c monitor_wrap.c ---- monitor_wrap.c 2008-07-11 09:36:48.000000000 +0200 -+++ monitor_wrap.c 2008-10-03 21:03:11.826698000 +0200 -@@ -1255,4 +1255,27 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ - #endif /* GSSAPI */ -diff --speed-large-files --minimal -Nru monitor_wrap.h monitor_wrap.h ---- monitor_wrap.h 2006-08-05 04:39:40.000000000 +0200 -+++ monitor_wrap.h 2008-10-03 21:03:11.840740600 +0200 -@@ -59,6 +59,7 @@ - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); - int mm_ssh_gssapi_userok(char *user); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - #endif - - #ifdef USE_PAM -diff --speed-large-files --minimal -Nru readconf.c readconf.c ---- readconf.c 2008-06-29 16:04:03.000000000 +0200 -+++ readconf.c 2008-10-03 21:03:11.864483000 +0200 -@@ -127,6 +127,8 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssKeyEx, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, -@@ -164,10 +166,14 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -444,10 +450,18 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1016,7 +1030,9 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1106,8 +1122,12 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff --speed-large-files --minimal -Nru readconf.h readconf.h ---- readconf.h 2008-06-29 16:04:03.000000000 +0200 -+++ readconf.h 2008-10-03 21:03:11.882030400 +0200 -@@ -44,7 +44,9 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff --speed-large-files --minimal -Nru servconf.c servconf.c ---- servconf.c 2008-07-04 05:51:12.000000000 +0200 -+++ servconf.c 2008-10-03 21:03:11.907984000 +0200 -@@ -92,7 +92,9 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -209,8 +211,12 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -299,7 +305,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sDeprecated, sUnsupported -@@ -360,9 +368,13 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, -@@ -882,10 +894,18 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; -diff --speed-large-files --minimal -Nru servconf.h servconf.h ---- servconf.h 2008-06-10 15:01:51.000000000 +0200 -+++ servconf.h 2008-10-03 21:03:11.935018800 +0200 -@@ -91,7 +91,9 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -diff --speed-large-files --minimal -Nru ssh-gss.h ssh-gss.h ---- ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ ssh-gss.h 2008-10-03 21:03:11.947192800 +0200 -@@ -60,6 +60,17 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; -@@ -97,6 +108,7 @@ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -119,6 +131,11 @@ - int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *); -+char *ssh_gssapi_client_mechanisms(const char *host); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - int ssh_gssapi_userok(char *name); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -@@ -126,6 +143,8 @@ - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff --speed-large-files --minimal -Nru ssh_config ssh_config ---- ssh_config 2007-06-11 06:04:42.000000000 +0200 -+++ ssh_config 2008-10-03 21:03:11.958427200 +0200 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -diff --speed-large-files --minimal -Nru ssh_config.5 ssh_config.5 ---- ssh_config.5 2008-06-29 16:04:03.000000000 +0200 -+++ ssh_config.5 2008-10-03 21:03:11.981607200 +0200 -@@ -478,11 +478,28 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes -+to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no , -+the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff --speed-large-files --minimal -Nru sshconnect2.c sshconnect2.c ---- sshconnect2.c 2008-07-17 11:15:43.000000000 +0200 -+++ sshconnect2.c 2008-10-03 21:03:12.017715400 +0200 -@@ -102,9 +102,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -132,6 +157,16 @@ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - options.hostkeyalgorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -141,10 +176,21 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_host = gss_host; -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -227,6 +273,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -242,6 +289,10 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - &options.gss_authentication, -@@ -511,6 +562,12 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ char *gss_host = NULL; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = (char *)authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -523,7 +580,7 @@ - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -619,8 +676,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -727,6 +784,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -diff --speed-large-files --minimal -Nru sshd.c sshd.c ---- sshd.c 2008-07-11 09:36:49.000000000 +0200 -+++ sshd.c 2008-10-03 21:03:12.054280000 +0200 -@@ -120,6 +120,10 @@ - #include "monitor_fdpass.h" - #include "version.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -1531,10 +1535,13 @@ - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); -@@ -1818,6 +1825,60 @@ - /* Log the connection. */ - verbose("Connection from %.500s port %d", remote_ip, remote_port); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2195,12 +2256,59 @@ - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -diff --speed-large-files --minimal -Nru sshd_config sshd_config ---- sshd_config 2008-07-02 14:35:43.000000000 +0200 -+++ sshd_config 2008-10-03 21:03:12.082510000 +0200 -@@ -73,6 +73,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -diff --speed-large-files --minimal -Nru sshd_config.5 sshd_config.5 ---- sshd_config.5 2008-07-02 14:35:43.000000000 +0200 -+++ sshd_config.5 2008-10-03 21:03:12.104920600 +0200 -@@ -374,12 +374,35 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed Added: csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-03-21 17:30:32 UTC (rev 3855) @@ -0,0 +1,2170 @@ +diff -urN ChangeLog.gssapi ChangeLog.gssapi +--- ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 ++++ ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200 +@@ -0,0 +1,75 @@ ++20080404 ++ - [ gss-serv.c ] ++ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow ++ been omitted from a previous version of this patch. Reported by Borislav ++ Stoichkov ++ ++20070317 ++ - [ gss-serv-krb5.c ] ++ Remove C99ism, where new_ccname was being declared in the middle of a ++ function ++ ++20061220 ++ - [ servconf.c ] ++ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and ++ documented, behaviour. Reported by Dan Watson. ++ ++20060910 ++ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c ++ ssh-gss.h ] ++ add support for gss-group14-sha1 key exchange mechanisms ++ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] ++ Add GSSAPIStrictAcceptorCheck option to allow the disabling of ++ acceptor principal checking on multi-homed machines. ++ ++ - [ sshd_config ssh_config ] ++ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample ++ configuration files ++ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] ++ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() ++ Limit length of error messages displayed by client ++ ++20060909 ++ - [ gss-genr.c gss-serv.c ] ++ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server ++ only, where they belong ++ ++ ++20060829 ++ - [ gss-serv-krb5.c ] ++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment ++ variable ++ ++20060828 ++ - [ gss-genr.c ] ++ Avoid Heimdal context freeing problem ++ ++ ++20060818 ++ - [ gss-genr.c ssh-gss.h sshconnect2.c ] ++ Make sure that SPENGO is disabled ++ ++ ++20060421 ++ - [ gssgenr.c, sshconnect2.c ] ++ a few type changes (signed versus unsigned, int versus size_t) to ++ fix compiler errors/warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ kexgssc.c, sshconnect2.c ] ++ fix uninitialized variable warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ gssgenr.c ] ++ pass oid to gss_display_status (helpful when using GSSAPI mechglue) ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ gss-serv-krb5.c ] ++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c ++ add client-side GssapiKeyExchange option ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ sshconnect2.c ] ++ add support for GssapiTrustDns option for gssapi-with-mic ++ (from jbasney AT ncsa.uiuc.edu) ++ +diff -urN openssh-5.2p1/Makefile.in openssh-5.2p1.new/Makefile.in +--- Makefile.in 2008-11-05 06:20:46.000000000 +0100 ++++ Makefile.in 2009-03-21 15:39:14.000000000 +0100 +@@ -71,7 +71,7 @@ + atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ + kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ +- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o ++ entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o jpake.o schnorr.o + + SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ + sshconnect.o sshconnect1.o sshconnect2.o mux.o +@@ -84,7 +84,7 @@ + auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ + monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ + auth-krb5.o \ +- auth2-gss.o gss-serv.o gss-serv-krb5.o \ ++ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ + audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o + +diff -urN openssh-5.2p1/auth-krb5.c openssh-5.2p1.new/auth-krb5.c +--- auth-krb5.c 2006-08-05 04:39:39.000000000 +0200 ++++ auth-krb5.c 2009-03-21 15:19:18.000000000 +0100 +@@ -166,8 +166,13 @@ + + len = strlen(authctxt->krb5_ticket_file) + 6; + authctxt->krb5_ccname = xmalloc(len); ++#ifdef USE_CCAPI ++ snprintf(authctxt->krb5_ccname, len, "API:%s", ++ authctxt->krb5_ticket_file); ++#else + snprintf(authctxt->krb5_ccname, len, "FILE:%s", + authctxt->krb5_ticket_file); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -219,15 +224,22 @@ + #ifndef HEIMDAL + krb5_error_code + ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { +- int tmpfd, ret; ++ int ret; + char ccname[40]; + mode_t old_umask; ++#ifdef USE_CCAPI ++ char cctemplate[] = "API:krb5cc_%d"; ++#else ++ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; ++ int tmpfd; ++#endif + + ret = snprintf(ccname, sizeof(ccname), +- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); ++ cctemplate, geteuid()); + if (ret < 0 || (size_t)ret >= sizeof(ccname)) + return ENOMEM; + ++#ifndef USE_CCAPI + old_umask = umask(0177); + tmpfd = mkstemp(ccname + strlen("FILE:")); + umask(old_umask); +@@ -242,6 +254,7 @@ + return errno; + } + close(tmpfd); ++#endif + + return (krb5_cc_resolve(ctx, ccname, ccache)); + } +diff -urN openssh-5.2p1/auth.h openssh-5.2p1.new/auth.h +--- auth.h 2008-11-05 06:20:46.000000000 +0100 ++++ auth.h 2009-03-21 15:19:18.000000000 +0100 +@@ -53,6 +53,7 @@ + int valid; /* user exists and is allowed to login */ + int attempt; + int failures; ++ int server_caused_failure; + int force_pwchange; + char *user; /* username sent by the client */ + char *service; +diff -urN openssh-5.2p1/auth2-gss.c openssh-5.2p1.new/auth2-gss.c +--- auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 ++++ auth2-gss.c 2009-03-21 15:19:18.000000000 +0100 +@@ -52,6 +52,39 @@ + static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); + static void input_gssapi_errtok(int, u_int32_t, void *); + ++/* ++ * The 'gssapi_keyex' userauth mechanism. ++ */ ++static int ++userauth_gsskeyex(Authctxt *authctxt) ++{ ++ int authenticated = 0; ++ Buffer b; ++ gss_buffer_desc mic, gssbuf; ++ u_int len; ++ ++ mic.value = packet_get_string(&len); ++ mic.length = len; ++ ++ packet_check_eom(); ++ ++ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, ++ "gssapi-keyex"); ++ ++ gssbuf.value = buffer_ptr(&b); ++ gssbuf.length = buffer_len(&b); ++ ++ /* gss_kex_context is NULL with privsep, so we can't check it here */ ++ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, ++ &gssbuf, &mic)))) ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); ++ ++ buffer_free(&b); ++ xfree(mic.value); ++ ++ return (authenticated); ++} ++ + /* + * We only support those mechanisms that we know about (ie ones that we know + * how to check local user kuserok and the like) +@@ -102,6 +135,7 @@ + + if (!present) { + xfree(doid); ++ authctxt->server_caused_failure = 1; + return (0); + } + +@@ -109,6 +143,7 @@ + if (ctxt != NULL) + ssh_gssapi_delete_ctx(&ctxt); + xfree(doid); ++ authctxt->server_caused_failure = 1; + return (0); + } + +@@ -292,6 +327,12 @@ + userauth_finish(authctxt, authenticated, "gssapi-with-mic"); + } + ++Authmethod method_gsskeyex = { ++ "gssapi-keyex", ++ userauth_gsskeyex, ++ &options.gss_authentication ++}; ++ + Authmethod method_gssapi = { + "gssapi-with-mic", + userauth_gssapi, +diff -urN openssh-5.2p1/auth2.c openssh-5.2p1.new/auth2.c +--- auth2.c 2008-11-05 06:20:46.000000000 +0100 ++++ auth2.c 2009-03-21 15:19:18.000000000 +0100 +@@ -69,6 +69,7 @@ + extern Authmethod method_kbdint; + extern Authmethod method_hostbased; + #ifdef GSSAPI ++extern Authmethod method_gsskeyex; + extern Authmethod method_gssapi; + #endif + #ifdef JPAKE +@@ -79,6 +80,7 @@ + &method_none, + &method_pubkey, + #ifdef GSSAPI ++ &method_gsskeyex, + &method_gssapi, + #endif + #ifdef JPAKE +@@ -274,6 +276,7 @@ + #endif + + authctxt->postponed = 0; ++ authctxt->server_caused_failure = 0; + + /* try to authenticate user */ + m = authmethod_lookup(method); +@@ -348,7 +351,9 @@ + /* Allow initial try of "none" auth without failure penalty */ + if (authctxt->attempt > 1 || strcmp(method, "none") != 0) + authctxt->failures++; +- if (authctxt->failures >= options.max_authtries) { ++ /* Dont count server configuration issues against the client */ ++ if (!authctxt->server_caused_failure && ++ authctxt->failures++ > options.max_authtries) { + #ifdef SSH_AUDIT_EVENTS + PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); + #endif +diff -urN openssh-5.2p1/configure.ac openssh-5.2p1.new/configure.ac +--- configure.ac 2009-02-16 05:37:03.000000000 +0100 ++++ configure.ac 2009-03-21 15:19:19.000000000 +0100 +@@ -473,6 +473,30 @@ + [Use tunnel device compatibility to OpenBSD]) + AC_DEFINE(SSH_TUN_PREPEND_AF, 1, + [Prepend the address family to IP tunnel traffic]) ++ AC_MSG_CHECKING(if we have the Security Authorization Session API) ++ AC_TRY_COMPILE([#include ], ++ [SessionCreate(0, 0);], ++ [ac_cv_use_security_session_api="yes" ++ AC_DEFINE(USE_SECURITY_SESSION_API, 1, ++ [platform has the Security Authorization Session API]) ++ LIBS="$LIBS -framework Security" ++ AC_MSG_RESULT(yes)], ++ [ac_cv_use_security_session_api="no" ++ AC_MSG_RESULT(no)]) ++ AC_MSG_CHECKING(if we have an in-memory credentials cache) ++ AC_TRY_COMPILE( ++ [#include ], ++ [cc_context_t c; ++ (void) cc_initialize (&c, 0, NULL, NULL);], ++ [AC_DEFINE(USE_CCAPI, 1, ++ [platform uses an in-memory credentials cache]) ++ LIBS="$LIBS -framework Security" ++ AC_MSG_RESULT(yes) ++ if test "x$ac_cv_use_security_session_api" = "xno"; then ++ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) ++ fi], ++ [AC_MSG_RESULT(no)] ++ ) + m4_pattern_allow(AU_IPv) + AC_CHECK_DECL(AU_IPv4, [], + AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) +diff -urN openssh-5.2p1/gss-genr.c openssh-5.2p1.new/gss-genr.c +--- gss-genr.c 2007-06-12 15:44:36.000000000 +0200 ++++ gss-genr.c 2009-03-21 15:19:19.000000000 +0100 +@@ -39,12 +39,160 @@ + #include "buffer.h" + #include "log.h" + #include "ssh2.h" ++#include "cipher.h" ++#include "key.h" ++#include "kex.h" ++#include + + #include "ssh-gss.h" + + extern u_char *session_id2; + extern u_int session_id2_len; + ++typedef struct { ++ char *encoded; ++ gss_OID oid; ++} ssh_gss_kex_mapping; ++ ++/* ++ * XXX - It would be nice to find a more elegant way of handling the ++ * XXX passing of the key exchange context to the userauth routines ++ */ ++ ++Gssctxt *gss_kex_context = NULL; ++ ++static ssh_gss_kex_mapping *gss_enc2oid = NULL; ++ ++int ++ssh_gssapi_oid_table_ok() { ++ return (gss_enc2oid != NULL); ++} ++ ++/* ++ * Return a list of the gss-group1-sha1 mechanisms supported by this program ++ * ++ * We test mechanisms to ensure that we can use them, to avoid starting ++ * a key exchange with a bad mechanism ++ */ ++ ++char * ++ssh_gssapi_client_mechanisms(const char *host) { ++ gss_OID_set gss_supported; ++ OM_uint32 min_status; ++ ++ gss_indicate_mechs(&min_status, &gss_supported); ++ ++ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, ++ host)); ++} ++ ++char * ++ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, ++ const char *data) { ++ Buffer buf; ++ size_t i; ++ int oidpos, enclen; ++ char *mechs, *encoded; ++ u_char digest[EVP_MAX_MD_SIZE]; ++ char deroid[2]; ++ const EVP_MD *evp_md = EVP_md5(); ++ EVP_MD_CTX md; ++ ++ if (gss_enc2oid != NULL) { ++ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) ++ xfree(gss_enc2oid[i].encoded); ++ xfree(gss_enc2oid); ++ } ++ ++ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * ++ (gss_supported->count + 1)); ++ ++ buffer_init(&buf); ++ ++ oidpos = 0; ++ for (i = 0; i < gss_supported->count; i++) { ++ if (gss_supported->elements[i].length < 128 && ++ (*check)(NULL, &(gss_supported->elements[i]), data)) { ++ ++ deroid[0] = SSH_GSS_OIDTYPE; ++ deroid[1] = gss_supported->elements[i].length; ++ ++ EVP_DigestInit(&md, evp_md); ++ EVP_DigestUpdate(&md, deroid, 2); ++ EVP_DigestUpdate(&md, ++ gss_supported->elements[i].elements, ++ gss_supported->elements[i].length); ++ EVP_DigestFinal(&md, digest, NULL); ++ ++ encoded = xmalloc(EVP_MD_size(evp_md) * 2); ++ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), ++ encoded, EVP_MD_size(evp_md) * 2); ++ ++ if (oidpos != 0) ++ buffer_put_char(&buf, ','); ++ ++ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, ++ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ buffer_put_char(&buf, ','); ++ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, ++ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ buffer_put_char(&buf, ','); ++ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, ++ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); ++ buffer_append(&buf, encoded, enclen); ++ ++ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); ++ gss_enc2oid[oidpos].encoded = encoded; ++ oidpos++; ++ } ++ } ++ gss_enc2oid[oidpos].oid = NULL; ++ gss_enc2oid[oidpos].encoded = NULL; ++ ++ buffer_put_char(&buf, '\0'); ++ ++ mechs = xmalloc(buffer_len(&buf)); ++ buffer_get(&buf, mechs, buffer_len(&buf)); ++ buffer_free(&buf); ++ ++ if (strlen(mechs) == 0) { ++ xfree(mechs); ++ mechs = NULL; ++ } ++ ++ return (mechs); ++} ++ ++gss_OID ++ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { ++ int i = 0; ++ ++ switch (kex_type) { ++ case KEX_GSS_GRP1_SHA1: ++ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; ++ break; ++ case KEX_GSS_GRP14_SHA1: ++ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; ++ break; ++ case KEX_GSS_GEX_SHA1: ++ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; ++ break; ++ default: ++ return GSS_C_NO_OID; ++ } ++ ++ while (gss_enc2oid[i].encoded != NULL && ++ strcmp(name, gss_enc2oid[i].encoded) != 0) ++ i++; ++ ++ if (gss_enc2oid[i].oid != NULL && ctx != NULL) ++ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); ++ ++ return gss_enc2oid[i].oid; ++} ++ + /* Check that the OID in a data stream matches that in the context */ + int + ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) +@@ -229,6 +377,9 @@ + OM_uint32 + ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) + { ++ if (ctx == NULL) ++ return -1; ++ + if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, + GSS_C_QOP_DEFAULT, buffer, hash))) + ssh_gssapi_error(ctx); +@@ -236,6 +387,19 @@ + return (ctx->major); + } + ++/* Priviledged when used by server */ ++OM_uint32 ++ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) ++{ ++ if (ctx == NULL) ++ return -1; ++ ++ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, ++ gssbuf, gssmic, NULL); ++ ++ return (ctx->major); ++} ++ + void + ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, + const char *context) +@@ -254,6 +418,10 @@ + gss_buffer_desc token = GSS_C_EMPTY_BUFFER; + OM_uint32 major, minor; + gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; ++ Gssctxt *intctx = NULL; ++ ++ if (ctx == NULL) ++ ctx = &intctx; + + /* RFC 4462 says we MUST NOT do SPNEGO */ + if (oid->length == spnego_oid.length && +@@ -272,7 +440,7 @@ + GSS_C_NO_BUFFER); + } + +- if (GSS_ERROR(major)) ++ if (GSS_ERROR(major) || intctx != NULL) + ssh_gssapi_delete_ctx(ctx); + + return (!GSS_ERROR(major)); +diff -urN openssh-5.2p1/gss-serv-krb5.c openssh-5.2p1.new/gss-serv-krb5.c +--- gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 ++++ gss-serv-krb5.c 2009-03-21 15:19:19.000000000 +0100 +@@ -120,6 +120,7 @@ + krb5_principal princ; + OM_uint32 maj_status, min_status; + int len; ++ const char *new_ccname; + + if (client->creds == NULL) { + debug("No credentials stored"); +@@ -168,11 +169,16 @@ + return; + } + +- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); ++ new_ccname = krb5_cc_get_name(krb_context, ccache); ++ + client->store.envvar = "KRB5CCNAME"; +- len = strlen(client->store.filename) + 6; +- client->store.envval = xmalloc(len); +- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); ++#ifdef USE_CCAPI ++ xasprintf(&client->store.envval, "API:%s", new_ccname); ++ client->store.filename = NULL; ++#else ++ xasprintf(&client->store.envval, "FILE:%s", new_ccname); ++ client->store.filename = xstrdup(new_ccname); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +diff -urN openssh-5.2p1/gss-serv.c openssh-5.2p1.new/gss-serv.c +--- gss-serv.c 2008-05-19 07:05:07.000000000 +0200 ++++ gss-serv.c 2009-03-21 15:19:19.000000000 +0100 +@@ -1,7 +1,7 @@ + /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2008 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -45,8 +45,12 @@ + #include "channels.h" + #include "session.h" + #include "misc.h" ++#include "servconf.h" + + #include "ssh-gss.h" ++#include "monitor_wrap.h" ++ ++extern ServerOptions options; + + static ssh_gssapi_client gssapi_client = + { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, +@@ -81,25 +85,32 @@ + char lname[MAXHOSTNAMELEN]; + gss_OID_set oidset; + +- gss_create_empty_oid_set(&status, &oidset); +- gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ if (options.gss_strict_acceptor) { ++ gss_create_empty_oid_set(&status, &oidset); ++ gss_add_oid_set_member(&status, ctx->oid, &oidset); ++ ++ if (gethostname(lname, MAXHOSTNAMELEN)) { ++ gss_release_oid_set(&status, &oidset); ++ return (-1); ++ } + +- if (gethostname(lname, MAXHOSTNAMELEN)) { +- gss_release_oid_set(&status, &oidset); +- return (-1); +- } ++ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { ++ gss_release_oid_set(&status, &oidset); ++ return (ctx->major); ++ } ++ ++ if ((ctx->major = gss_acquire_cred(&ctx->minor, ++ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, ++ NULL, NULL))) ++ ssh_gssapi_error(ctx); + +- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { + gss_release_oid_set(&status, &oidset); + return (ctx->major); ++ } else { ++ ctx->name = GSS_C_NO_NAME; ++ ctx->creds = GSS_C_NO_CREDENTIAL; + } +- +- if ((ctx->major = gss_acquire_cred(&ctx->minor, +- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) +- ssh_gssapi_error(ctx); +- +- gss_release_oid_set(&status, &oidset); +- return (ctx->major); ++ return GSS_S_COMPLETE; + } + + /* Privileged */ +@@ -114,6 +125,28 @@ + } + + /* Unprivileged */ ++char * ++ssh_gssapi_server_mechanisms() { ++ gss_OID_set supported; ++ ++ ssh_gssapi_supported_oids(&supported); ++ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, ++ NULL)); ++} ++ ++/* Unprivileged */ ++int ++ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data) { ++ Gssctxt *ctx = NULL; ++ int res; ++ ++ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); ++ ssh_gssapi_delete_ctx(&ctx); ++ ++ return (res); ++} ++ ++/* Unprivileged */ + void + ssh_gssapi_supported_oids(gss_OID_set *oidset) + { +@@ -352,14 +385,4 @@ + return (0); + } + +-/* Privileged */ +-OM_uint32 +-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) +-{ +- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, +- gssbuf, gssmic, NULL); +- +- return (ctx->major); +-} +- + #endif +diff -urN openssh-5.2p1/kex.c openssh-5.2p1.new/kex.c +--- kex.c 2008-11-03 09:19:12.000000000 +0100 ++++ kex.c 2009-03-21 15:19:19.000000000 +0100 +@@ -49,6 +49,10 @@ + #include "dispatch.h" + #include "monitor.h" + ++#ifdef GSSAPI ++#include "ssh-gss.h" ++#endif ++ + #define KEX_COOKIE_LEN 16 + @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 22 00:24:53 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Mar 2009 23:24:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[3856] csw/mgar/pkg Message-ID: Revision: 3856 http://gar.svn.sourceforge.net/gar/?rev=3856&view=rev Author: wahwah Date: 2009-03-21 23:24:53 +0000 (Sat, 21 Mar 2009) Log Message: ----------- rxvt-unicode, CSWurxvt, using gcc-4, first commit Added Paths: ----------- csw/mgar/pkg/urxvt/ csw/mgar/pkg/urxvt/Makefile csw/mgar/pkg/urxvt/branches/ csw/mgar/pkg/urxvt/tags/ csw/mgar/pkg/urxvt/trunk/ csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums csw/mgar/pkg/urxvt/trunk/files/ csw/mgar/pkg/urxvt/trunk/files/CSWurxvt.gspec Added: csw/mgar/pkg/urxvt/Makefile =================================================================== --- csw/mgar/pkg/urxvt/Makefile (rev 0) +++ csw/mgar/pkg/urxvt/Makefile 2009-03-21 23:24:53 UTC (rev 3856) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2009-03-21 23:24:53 UTC (rev 3856) @@ -0,0 +1,39 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +GARNAME = rxvt-unicode +GARVERSION = 9.06 +CATEGORIES = apps + +DESCRIPTION = (ouR XVT, unicode) - a VT102 emulator for the X window system +define BLURB + rxvt-unicode, is a colour vt102 terminal emulator intended as an xterm(1) + replacement for users who do not require features such as Tektronix 4014 + emulation and toolkit-style configurability. As a result, rxvt-unicode uses + much less swap space -- a significant advantage on a machine serving many + X sessions. + + Documentation is available at: + http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod +endef + +MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(call admfiles,CSWurxvt,) + +# We define upstream file regex so we can be notifed of new upstream software +# release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://software.schmorp.de/pkg/rxvt-unicode.html + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-perl + +GARCOMPILER = GNU + +REQUIRED_PKGS_CSWurxvt = CSWfconfig CSWftype2 CSWlibxft2 CSWlibxrender CSWzlib +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums (rev 0) +++ csw/mgar/pkg/urxvt/trunk/checksums 2009-03-21 23:24:53 UTC (rev 3856) @@ -0,0 +1,2 @@ +4cb9330e99fc0b0b05cebf3581557dd8 download/rxvt-unicode-9.06.tar.bz2 +c108ec3aafeb40526dfe1868937f9030 download/CSWurxvt.gspec Added: csw/mgar/pkg/urxvt/trunk/files/CSWurxvt.gspec =================================================================== --- csw/mgar/pkg/urxvt/trunk/files/CSWurxvt.gspec (rev 0) +++ csw/mgar/pkg/urxvt/trunk/files/CSWurxvt.gspec 2009-03-21 23:24:53 UTC (rev 3856) @@ -0,0 +1,4 @@ +%var bitname urxvt +%var pkgname CSWurxvt +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 22 00:34:42 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Mar 2009 23:34:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3857] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 3857 http://gar.svn.sourceforge.net/gar/?rev=3857&view=rev Author: wahwah Date: 2009-03-21 23:34:41 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Updated MASTER_SITES and checksums for syslog_ng Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-03-21 23:24:53 UTC (rev 3856) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2009-03-21 23:34:41 UTC (rev 3857) @@ -9,8 +9,8 @@ logs using TCP. endef -MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(GARVERSION)/source/ +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsyslogng, postinstall depend prototype) DISTFILES += syslog-ng.conf.CSW DISTFILES += cswsyslog_ng @@ -18,9 +18,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/ SPKG_CLASSES = none cswinitsmf -PREREQUISITE_PKGS = CSWeventlog +PREREQUISITE_PKGS = CSWeventlog PREREQUISITE_PKGS += CSWggettext PREREQUISITE_PKGS += CSWglib2 PREREQUISITE_PKGS += CSWtcpwrap Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2009-03-21 23:24:53 UTC (rev 3856) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2009-03-21 23:34:41 UTC (rev 3857) @@ -1,4 +1,4 @@ -3f96ccf13dda0b9e150e511bcffde795 download/syslog-ng-2.0.10.tar.gz +e5ca55796c11899739affa417ff8a71e download/syslog-ng_2.0.10.tar.gz 6726e851fa8e6e6658584faaeaa6716d download/CSWsyslogng.gspec 3de835dbfde225227a1ed36f548e1d34 download/CSWsyslogng.postinstall 479df38d9a0e3a31422cea79b287412b download/CSWsyslogng.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 22 01:20:45 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Mar 2009 00:20:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[3858] csw/mgar/pkg/urxvt/trunk/ Message-ID: Revision: 3858 http://gar.svn.sourceforge.net/gar/?rev=3858&view=rev Author: wahwah Date: 2009-03-22 00:20:45 +0000 (Sun, 22 Mar 2009) Log Message: ----------- CSWurxvt, setting svn:externals and svn:ignore Property Changed: ---------------- csw/mgar/pkg/urxvt/trunk/ Property changes on: csw/mgar/pkg/urxvt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download gar work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 22 10:22:35 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Mar 2009 09:22:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[3859] csw/mgar/pkg Message-ID: Revision: 3859 http://gar.svn.sourceforge.net/gar/?rev=3859&view=rev Author: wahwah Date: 2009-03-22 09:22:35 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Keychain, ssh-agent manager, first commit Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/keychain/ csw/mgar/pkg/keychain/trunk/ Removed Paths: ------------- csw/mgar/pkg/keychain/trunk/ Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-03-18 22:21:09 UTC (rev 3810) +++ csw/mgar/pkg/keychain/trunk/Makefile 2009-03-22 09:22:35 UTC (rev 3859) @@ -1,24 +1,42 @@ -GARNAME = mypkg -GARVERSION = 1.0 -CATEGORIES = lib +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +GARNAME = keychain +GARVERSION = 2.6.8 +CATEGORIES = apps + DESCRIPTION = This is a useful library define BLURB - It does stuff with things + http://www.gentoo.org/doc/en/keychain-guide.xml + + If your ssh key is, say, id_dsa, add this to your ~/.bashrc and make sure it's + sourced on login: + + keychain "id_dsa" + . ~/.keychain/$$HOSTNAME-sh endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://agriffis.n01se.net/keychain/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -CONFIGURE_ARGS = $(DIRPATHS) +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = keychain +TEST_SCRIPTS = -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +install-keychain: + ginstall -d $(DESTDIR)$(bindir_install) + ginstall -m 755 $(WORKSRC)/keychain $(DESTDIR)$(bindir_install) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKSRC)/keychain.1 $(DESTDIR)$(mandir)/man1/ + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/keychain.pod $(DESTDIR)$(docdir)/$(GARNAME) -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-03-18 22:21:09 UTC (rev 3810) +++ csw/mgar/pkg/keychain/trunk/checksums 2009-03-22 09:22:35 UTC (rev 3859) @@ -0,0 +1 @@ +2a23b311e438ecebed5639b568738d28 download/keychain-2.6.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 22 14:57:28 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 22 Mar 2009 13:57:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[3860] csw/mgar/pkg/openssh/trunk/files/changelog.CSW Message-ID: Revision: 3860 http://gar.svn.sourceforge.net/gar/?rev=3860&view=rev Author: chninkel Date: 2009-03-22 13:57:26 +0000 (Sun, 22 Mar 2009) Log Message: ----------- openssh: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-03-22 09:22:35 UTC (rev 3859) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-03-22 13:57:26 UTC (rev 3860) @@ -1,3 +1,10 @@ +openssh (5.2,REV=2008.03.22_rev=p1) unstable + + * New upstream version. + * Split the client in a distinct package. + + -- Yann Rouillard Sun, 22 Mar 2009 10:34:39 +0100 + openssh (5.1,REV=2008.02.15_rev=p1) unstable * Package rebuild to solve incorrect package push in repository tree. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Mar 22 16:28:31 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 22 Mar 2009 15:28:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3861] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 3861 http://gar.svn.sourceforge.net/gar/?rev=3861&view=rev Author: j_arndt Date: 2009-03-22 15:28:31 +0000 (Sun, 22 Mar 2009) Log Message: ----------- nrpe: fixed paths in start script Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/cswnrpe Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2009-03-22 13:57:26 UTC (rev 3860) +++ csw/mgar/pkg/nrpe/trunk/checksums 2009-03-22 15:28:31 UTC (rev 3861) @@ -4,7 +4,7 @@ bda68135e2b65da40c3d2b68a3b8dc78 download/CSWnrpe.checkinstall 53eea7ed36535bb6cbe1d6fe0aae3508 download/CSWnrpe.preinstall 393872a95d2b9ec90363664c31074415 download/CSWnrpe.preremove -cbfc86ba77e78e2f860f90a303a1abe5 download/cswnrpe +4aad349d0e04e6cb8af186d87c44c3ba download/cswnrpe 2b35d5e0d57bcb3aff096040e0d06b8b download/CSWnrpeplugin.gspec e22a7817c7665e79bcbad7e091375be9 download/CSWnrpeplugin.prototype 5b02d4385daaea2a8c13903539aa6189 download/patch.diff Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-03-22 13:57:26 UTC (rev 3860) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2009-03-22 15:28:31 UTC (rev 3861) @@ -20,7 +20,7 @@ CONFIG_FILE=/etc/opt/csw/nrpe.cfg if [ ! -f $CONFIG_FILE ] ; then - CONFIG_FILE=/opt/csw/nagios/etc/nrpe.cfg + CONFIG_FILE=/opt/csw/etc/nrpe.cfg fi if [ ! -f $CONFIG_FILE ] @@ -28,7 +28,7 @@ exit $SMF_EXIT_ERR_CONFIG fi -BIN_FILE="/opt/csw/nagios/bin/nrpe" +BIN_FILE="/opt/csw/bin/nrpe" pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` NRPE_USER=`awk -F'=' '/nrpe_user/ { print $NF }' $CONFIG_FILE` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Mar 22 17:37:42 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 22 Mar 2009 16:37:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[3862] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 3862 http://gar.svn.sourceforge.net/gar/?rev=3862&view=rev Author: chninkel Date: 2009-03-22 16:37:35 +0000 (Sun, 22 Mar 2009) Log Message: ----------- openssh: added optionnal build instruction for lpk patch Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch csw/mgar/pkg/openssh/trunk/files/no_x_forwarding_bug.patch csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2009-03-22 15:28:31 UTC (rev 3861) +++ csw/mgar/pkg/openssh/trunk/Makefile 2009-03-22 16:37:35 UTC (rev 3862) @@ -38,7 +38,6 @@ DISTFILES += openssh_restart_workaround.sh # The GSSAPI key exchange patch -PATCHDIRLEVEL = 0 PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-$(GSSKEX_PATCH_DATE).patch # Prevent TIOCSCTTY from being used to avoid error: @@ -64,6 +63,12 @@ TEST_SCRIPTS = +ifdef LPK + MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/ + PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch + CONFIGURE_ARGS += --with-ldap +endif + include gar/category.mk Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2009-03-22 15:28:31 UTC (rev 3861) +++ csw/mgar/pkg/openssh/trunk/checksums 2009-03-22 16:37:35 UTC (rev 3862) @@ -1,7 +1,7 @@ ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz dc212745af1f549ce2a236401bf97c1b download/i.conf 5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -2ace8f24d32978fb8d550a1648483d5f download/changelog.CSW +780a273b9c28497e373dbc0ecc8d6fd1 download/changelog.CSW d1c2c49bcd3b65a601946e8316b0b018 download/CSWossh.gspec 6e91d098018d7e1855b626ea463b8a29 download/CSWossh.depend 1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall @@ -17,6 +17,7 @@ 1055c346c01d99d09572d978fad10256 download/CSWosshclient.depend 3446a3185dddc9a63b28c588685c629e download/CSWosshclient.prototype bd0f690fbb3abcbffe7924ae3016c8c3 download/openssh_restart_workaround.sh -05420ca20fada7ec02bd9474701abc4b download/openssh-5.2p1-gsskex-20081003.patch -04da9aaea49aa4b026f156a48e577a19 download/don_t_use_TIOCSCTTY.patch -38a20d4c63ada0a7a68226cf5e8af9c5 download/no_x_forwarding_bug.patch +bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch +4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch +ca5403c8e1539d5ced0573f289ed7aef download/no_x_forwarding_bug.patch +9153031524651a18e7edaed4637aa769 download/contrib-openssh-lpk-5.2p1-0.3.9.patch Added: csw/mgar/pkg/openssh/trunk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch 2009-03-22 16:37:35 UTC (rev 3862) @@ -0,0 +1,1884 @@ +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/Makefile.in openssh-5.2p1+lpk/Makefile.in +--- openssh-5.2p1.orig/Makefile.in 2008-11-05 06:20:46.000000000 +0100 ++++ openssh-5.2p1+lpk/Makefile.in 2009-03-22 15:59:08.607515800 +0100 +@@ -86,7 +86,7 @@ + auth-krb5.o \ + auth2-gss.o gss-serv.o gss-serv-krb5.o \ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ +- audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o ++ audit.o audit-bsm.o platform.o ldapauth.o sftp-server.o sftp-common.o + + MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out + MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/README.lpk openssh-5.2p1+lpk/README.lpk +--- openssh-5.2p1.orig/README.lpk 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1+lpk/README.lpk 2009-03-22 15:59:08.672813997 +0100 +@@ -0,0 +1,267 @@ ++OpenSSH LDAP PUBLIC KEY PATCH ++Copyright (c) 2003 Eric AUGE (eau at phear.org) ++All rights reserved. ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions ++are met: ++1. Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++3. The name of the author may not be used to endorse or promote products ++ derived from this software without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++purposes of this patch: ++ ++This patch would help to have authentication centralization policy ++using ssh public key authentication. ++This patch could be an alternative to other "secure" authentication system ++working in a similar way (Kerberos, SecurID, etc...), except the fact ++that it's based on OpenSSH and its public key abilities. ++ ++>> FYI: << ++'uid': means unix accounts existing on the current server ++'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config) ++ ++example schema: ++ ++ ++ server1 (uid: eau,rival,toto) (lpkServerGroup: unix) ++ ___________ / ++ / \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix) ++ | LDAP Server | \ ++ | eau ,rival | server2 (uid: rival, eau) (lpkServerGroup: unix) ++ | titi ,toto | ++ | userx,.... | server5 (uid: eau) (lpkServerGroup: mail) ++ \___________/ \ / ++ ----- - server4 (uid: eau, rival) (no group configured) ++ \ ++ etc... ++ ++- WHAT WE NEED : ++ ++ * configured LDAP server somewhere on the network (i.e. OpenLDAP) ++ * patched sshd (with this patch ;) ++ * LDAP user(/group) entry (look at users.ldif (& groups.ldif)): ++ User entry: ++ - attached to the 'ldapPublicKey' objectclass ++ - attached to the 'posixAccount' objectclass ++ - with a filled 'sshPublicKey' attribute ++ Example: ++ dn: uid=eau,ou=users,dc=cuckoos,dc=net ++ objectclass: top ++ objectclass: person ++ objectclass: organizationalPerson ++ objectclass: posixAccount ++ objectclass: ldapPublicKey ++ description: Eric AUGE Account ++ userPassword: blah ++ cn: Eric AUGE ++ sn: Eric AUGE ++ uid: eau ++ uidNumber: 1034 ++ gidNumber: 1 ++ homeDirectory: /export/home/eau ++ sshPublicKey: ssh-dss AAAAB3... ++ sshPublicKey: ssh-dss AAAAM5... ++ ++ Group entry: ++ - attached to the 'posixGroup' objectclass ++ - with a 'cn' groupname attribute ++ - with multiple 'memberUid' attributes filled with usernames allowed in this group ++ Example: ++ # few members ++ dn: cn=unix,ou=groups,dc=cuckoos,dc=net ++ objectclass: top ++ objectclass: posixGroup ++ description: Unix based servers group ++ cn: unix ++ gidNumber: 1002 ++ memberUid: eau ++ memberUid: user1 ++ memberUid: user2 ++ ++ ++- HOW IT WORKS : ++ ++ * without patch ++ If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..) ++ and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled). ++ ++ * with the patch ++ If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled. ++ It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. ++ (usually in $HOME/.ssh/authorized_keys) ++ ++ If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into. ++ If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled). ++ ++ 7 tokens are added to sshd_config : ++ # here is the new patched ldap related tokens ++ # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup ++ UseLPK yes # look the pub key into LDAP ++ LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3 # which LDAP server for users ? (URL format) ++ LpkUserDN ou=users,dc=foobar,dc=net # which base DN for users ? ++ LpkGroupDN ou=groups,dc=foobar,dc=net # which base DN for groups ? ++ LpkBindDN cn=manager,dc=foobar,dc=net # which bind DN ? ++ LpkBindPw asecret # bind DN credidentials ++ LpkServerGroup agroupname # the group the server is part of ++ ++ Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some ++ flaws you have to take care of. ++ ++- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY ++ ++ * my way (there is plenty :) ++ - create ldif file (i.e. users.ldif) ++ - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub ++ - my way in 4 steps : ++ Example: ++ ++ # you add this to the user entry in the LDIF file : ++ [...] ++ objectclass: posixAccount ++ objectclass: ldapPublicKey ++ [...] ++ sshPubliKey: ssh-dss AAAABDh12DDUR2... ++ [...] ++ ++ # insert your entry and you're done :) ++ ldapadd -D balblabla -w bleh < file.ldif ++ ++ all standard options can be present in the 'sshPublicKey' attribute. ++ ++- WHY : ++ ++ Simply because, i was looking for a way to centralize all sysadmins authentication, easily, without completely using LDAP ++ as authentication method (like pam_ldap etc..). ++ ++ After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get ++ public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser' ++ objectclass within LDAP and part of the group the SSH server is in). ++ ++ Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase ++ so each user can change it as much as he wants). ++ ++ Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only). ++ ++- RULES : ++ Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. ++ and the additionnal lpk.schema. ++ ++ This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication ++ (pamldap, nss_ldap, etc..). ++ ++ This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..). ++ ++ Referring to schema at the beginning of this file if user 'eau' is only in group 'unix' ++ 'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'. ++ If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able ++ to log in 'server5' (i hope you got the idea, my english is bad :). ++ ++ Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP ++ server. ++ When you want to allow a new user to have access to the server parc, you just add him an account on ++ your servers, you add his public key into his entry on the LDAP server, it's done. ++ ++ Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys). ++ ++ When the user needs to change his passphrase he can do it directly from his workstation by changing ++ his own key set lock passphrase, and all servers are automatically aware. ++ ++ With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself ++ so he can add/modify/delete himself his public key when needed. ++ ++\xAD FLAWS : ++ LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP ++ allow write to users dn, somebody could replace someuser's public key by its own and impersonate some ++ of your users in all your server farm be VERY CAREFUL. ++ ++ MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login ++ as the impersonnated user. ++ ++ If LDAP server is down then, fallback on passwd auth. ++ ++ the ldap code part has not been well audited yet. ++ ++- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif) ++ --- CUT HERE --- ++ dn: uid=jdoe,ou=users,dc=foobar,dc=net ++ objectclass: top ++ objectclass: person ++ objectclass: organizationalPerson ++ objectclass: posixAccount ++ objectclass: ldapPublicKey ++ description: My account ++ cn: John Doe ++ sn: John Doe ++ uid: jdoe ++ uidNumber: 100 ++ gidNumber: 100 ++ homeDirectory: /home/jdoe ++ sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB.... ++ [...] ++ --- CUT HERE --- ++ ++- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif) ++ --- CUT HERE --- ++ dn: cn=unix,ou=groups,dc=cuckoos,dc=net ++ objectclass: top ++ objectclass: posixGroup ++ description: Unix based servers group ++ cn: unix ++ gidNumber: 1002 ++ memberUid: jdoe ++ memberUid: user1 ++ memberUid: user2 ++ [...] ++ --- CUT HERE --- ++ ++>> FYI: << ++Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry ++ ++- COMPILING: ++ 1. Apply the patch ++ 2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes ++ 3. make ++ 4. it's done. ++ ++- BLA : ++ I hope this could help, and i hope to be clear enough,, or give ideas. questions/comments/improvements are welcome. ++ ++- TODO : ++ Redesign differently. ++ ++- DOCS/LINK : ++ http://pacsec.jp/core05/psj05-barisani-en.pdf ++ http://fritz.potsdam.edu/projects/openssh-lpk/ ++ http://fritz.potsdam.edu/projects/sshgate/ ++ http://dev.inversepath.com/trac/openssh-lpk ++ http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm ) ++ ++- CONTRIBUTORS/IDEAS/GREETS : ++ - Falk Siemonsmeier. ++ - Jacob Rief. ++ - Michael Durchgraf. ++ - frederic peters. ++ - Finlay dobbie. ++ - Stefan Fisher. ++ - Robin H. Johnson. ++ - Adrian Bridgett. ++ ++- CONTACT : ++ - Eric AUGE ++ - Andrea Barisani +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/auth-rsa.c openssh-5.2p1+lpk/auth-rsa.c +--- openssh-5.2p1.orig/auth-rsa.c 2008-07-02 14:37:30.000000000 +0200 ++++ openssh-5.2p1+lpk/auth-rsa.c 2009-03-22 15:59:08.132715250 +0100 +@@ -174,10 +174,96 @@ + FILE *f; + u_long linenum = 0; + Key *key; ++#ifdef WITH_LDAP_PUBKEY ++ ldap_key_t * k; ++ unsigned int i = 0; ++#endif + + /* Temporarily use the user's uid. */ + temporarily_use_uid(pw); + ++#ifdef WITH_LDAP_PUBKEY ++ /* here is the job */ ++ key = key_new(KEY_RSA1); ++ ++ if (options.lpk.on) { ++ debug("[LDAP] trying LDAP first uid=%s", pw->pw_name); ++ if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) { ++ if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) { ++ for (i = 0 ; i < k->num ; i++) { ++ char *cp, *options = NULL; ++ ++ for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (!*cp || *cp == '\n' || *cp == '#') ++ continue; ++ ++ /* ++ * Check if there are options for this key, and if so, ++ * save their starting address and skip the option part ++ * for now. If there are no options, set the starting ++ * address to NULL. ++ */ ++ if (*cp < '0' || *cp > '9') { ++ int quoted = 0; ++ options = cp; ++ for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { ++ if (*cp == '\\' && cp[1] == '"') ++ cp++; /* Skip both */ ++ else if (*cp == '"') ++ quoted = !quoted; ++ } ++ } else ++ options = NULL; ++ ++ /* Parse the key from the line. */ ++ if (hostfile_read_key(&cp, &bits, key) == 0) { ++ debug("[LDAP] line %d: non ssh1 key syntax", i); ++ continue; ++ } ++ /* cp now points to the comment part. */ ++ ++ /* Check if the we have found the desired key (identified by its modulus). */ ++ if (BN_cmp(key->rsa->n, client_n) != 0) ++ continue; ++ ++ /* check the real bits */ ++ if (bits != (unsigned int)BN_num_bits(key->rsa->n)) ++ logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: " ++ "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits); ++ ++ /* We have found the desired key. */ ++ /* ++ * If our options do not allow this key to be used, ++ * do not send challenge. ++ */ ++ if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i)) ++ continue; ++ ++ /* break out, this key is allowed */ ++ allowed = 1; ++ ++ /* add the return stuff etc... */ ++ /* Restore the privileged uid. */ ++ restore_uid(); ++ ++ /* return key if allowed */ ++ if (allowed && rkey != NULL) ++ *rkey = key; ++ else ++ key_free(key); ++ ++ ldap_keys_free(k); ++ return (allowed); ++ } ++ } else { ++ logit("[LDAP] no keys found for '%s'!", pw->pw_name); ++ } ++ } else { ++ logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup); ++ } ++ } ++#endif + /* The authorized keys. */ + file = authorized_keys_file(pw); + debug("trying public RSA key file %s", file); +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/auth2-pubkey.c openssh-5.2p1+lpk/auth2-pubkey.c +--- openssh-5.2p1.orig/auth2-pubkey.c 2008-07-04 04:54:25.000000000 +0200 ++++ openssh-5.2p1+lpk/auth2-pubkey.c 2009-03-22 15:59:08.102307504 +0100 +@@ -55,6 +55,10 @@ + #include "monitor_wrap.h" + #include "misc.h" + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + /* import */ + extern ServerOptions options; + extern u_char *session_id2; +@@ -187,10 +191,79 @@ + u_long linenum = 0; + Key *found; + char *fp; ++#ifdef WITH_LDAP_PUBKEY ++ ldap_key_t * k; ++ unsigned int i = 0; ++#endif + + /* Temporarily use the user's uid. */ + temporarily_use_uid(pw); + ++#ifdef WITH_LDAP_PUBKEY ++ found_key = 0; ++ /* allocate a new key type */ ++ found = key_new(key->type); ++ ++ /* first check if the options is enabled, then try.. */ ++ if (options.lpk.on) { ++ debug("[LDAP] trying LDAP first uid=%s",pw->pw_name); ++ if (ldap_ismember(&options.lpk, pw->pw_name) > 0) { ++ if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) { ++ /* Skip leading whitespace, empty and comment lines. */ ++ for (i = 0 ; i < k->num ; i++) { ++ /* dont forget if multiple keys to reset options */ ++ char *cp, *options = NULL; ++ ++ for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (!*cp || *cp == '\n' || *cp == '#') ++ continue; ++ ++ if (key_read(found, &cp) != 1) { ++ /* no key? check if there are options for this key */ ++ int quoted = 0; ++ debug2("[LDAP] user_key_allowed: check options: '%s'", cp); ++ options = cp; ++ for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { ++ if (*cp == '\\' && cp[1] == '"') ++ cp++; /* Skip both */ ++ else if (*cp == '"') ++ quoted = !quoted; ++ } ++ /* Skip remaining whitespace. */ ++ for (; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (key_read(found, &cp) != 1) { ++ debug2("[LDAP] user_key_allowed: advance: '%s'", cp); ++ /* still no key? advance to next line*/ ++ continue; ++ } ++ } ++ ++ if (key_equal(found, key) && ++ auth_parse_options(pw, options, file, linenum) == 1) { ++ found_key = 1; ++ debug("[LDAP] matching key found"); ++ fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); ++ verbose("[LDAP] Found matching %s key: %s", key_type(found), fp); ++ ++ /* restoring memory */ ++ ldap_keys_free(k); ++ xfree(fp); ++ restore_uid(); ++ key_free(found); ++ return found_key; ++ break; ++ } ++ }/* end of LDAP for() */ ++ } else { ++ logit("[LDAP] no keys found for '%s'!", pw->pw_name); ++ } ++ } else { ++ logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup); ++ } ++ } ++#endif + debug("trying public key file %s", file); + f = auth_openkeyfile(file, pw, options.strict_modes); + +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/config.h.in openssh-5.2p1+lpk/config.h.in +--- openssh-5.2p1.orig/config.h.in 2009-02-23 01:18:12.000000000 +0100 ++++ openssh-5.2p1+lpk/config.h.in 2009-03-22 15:59:08.195639244 +0100 +@@ -563,6 +563,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LINUX_IF_TUN_H + ++/* Define if you want LDAP support */ ++#undef WITH_LDAP_PUBKEY ++ + /* Define if your libraries define login() */ + #undef HAVE_LOGIN + +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/configure openssh-5.2p1+lpk/configure +--- openssh-5.2p1.orig/configure 2009-02-23 01:18:14.000000000 +0100 ++++ openssh-5.2p1+lpk/configure 2009-03-22 15:59:08.400328912 +0100 +@@ -1340,6 +1340,7 @@ + --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH) + --with-libedit[=PATH] Enable libedit support for sftp + --with-audit=module Enable EXPERIMENTAL audit support (modules=debug,bsm) ++ --with-ldap[=PATH] Enable LDAP pubkey support (optionally in PATH) + --with-ssl-dir=PATH Specify path to OpenSSL installation + --without-openssl-header-check Disable OpenSSL version consistency check + --with-ssl-engine Enable OpenSSL (hardware) ENGINE support +@@ -12767,6 +12768,85 @@ + fi + + ++# Check whether user wants LDAP support ++LDAP_MSG="no" ++ ++# Check whether --with-ldap was given. ++if test "${with_ldap+set}" = set; then ++ withval=$with_ldap; ++ if test "x$withval" != "xno" ; then ++ ++ if test "x$withval" != "xyes" ; then ++ CPPFLAGS="$CPPFLAGS -I${withval}/include" ++ LDFLAGS="$LDFLAGS -L${withval}/lib" ++ fi ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define WITH_LDAP_PUBKEY 1 ++_ACEOF ++ ++ LIBS="-lldap $LIBS" ++ LDAP_MSG="yes" ++ ++ { echo "$as_me:$LINENO: checking for LDAP support" >&5 ++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ #include ++int ++main () ++{ ++(void)ldap_init(0, 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5 ++echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;} ++ { (exit 1); exit 1; }; } ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi ++ ++ ++fi ++ ++ + + + +@@ -30543,6 +30623,7 @@ + echo " Smartcard support: $SCARD_MSG" + echo " S/KEY support: $SKEY_MSG" + echo " TCP Wrappers support: $TCPW_MSG" ++echo " LDAP support: $LDAP_MSG" + echo " MD5 password support: $MD5_MSG" + echo " libedit support: $LIBEDIT_MSG" + echo " Solaris process contract support: $SPC_MSG" +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/configure.ac openssh-5.2p1+lpk/configure.ac +--- openssh-5.2p1.orig/configure.ac 2009-02-16 05:37:03.000000000 +0100 ++++ openssh-5.2p1+lpk/configure.ac 2009-03-22 15:59:08.490709251 +0100 +@@ -1314,6 +1314,37 @@ + esac ] + ) + ++# Check whether user wants LDAP support ++LDAP_MSG="no" ++AC_ARG_WITH(ldap, ++ [ --with-ldap[[=PATH]] Enable LDAP pubkey support (optionally in PATH)], ++ [ ++ if test "x$withval" != "xno" ; then ++ ++ if test "x$withval" != "xyes" ; then ++ CPPFLAGS="$CPPFLAGS -I${withval}/include" ++ LDFLAGS="$LDFLAGS -L${withval}/lib" ++ fi ++ ++ AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support]) ++ LIBS="-lldap $LIBS" ++ LDAP_MSG="yes" ++ ++ AC_MSG_CHECKING([for LDAP support]) ++ AC_TRY_COMPILE( ++ [#include ++ #include ], ++ [(void)ldap_init(0, 0);], ++ [AC_MSG_RESULT(yes)], ++ [ ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([** Incomplete or missing ldap libraries **]) ++ ] ++ ) ++ fi ++ ] ++) ++ + dnl Checks for library functions. Please keep in alphabetical order + AC_CHECK_FUNCS( \ + arc4random \ +@@ -4163,6 +4194,7 @@ + echo " Smartcard support: $SCARD_MSG" + echo " S/KEY support: $SKEY_MSG" + echo " TCP Wrappers support: $TCPW_MSG" ++echo " LDAP support: $LDAP_MSG" + echo " MD5 password support: $MD5_MSG" + echo " libedit support: $LIBEDIT_MSG" + echo " Solaris process contract support: $SPC_MSG" +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/ldapauth.c openssh-5.2p1+lpk/ldapauth.c +--- openssh-5.2p1.orig/ldapauth.c 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1+lpk/ldapauth.c 2009-03-22 15:59:08.528655666 +0100 +@@ -0,0 +1,575 @@ ++/* ++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ ++ */ ++ ++/* ++ * ++ * Copyright (c) 2005, Eric AUGE ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: ++ * ++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, ++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * ++ */ ++ ++#include "includes.h" ++ ++#ifdef WITH_LDAP_PUBKEY ++ ++#include ++#include ++#include ++#include ++ ++#include "ldapauth.h" ++#include "log.h" ++ ++static char *attrs[] = { ++ PUBKEYATTR, ++ NULL ++}; ++ ++/* filter building infos */ ++#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)" ++#define FILTER_OR_PREFIX "(|" ++#define FILTER_OR_SUFFIX ")" ++#define FILTER_CN_PREFIX "(cn=" ++#define FILTER_CN_SUFFIX ")" ++#define FILTER_UID_FORMAT "(memberUid=%s)" ++#define FILTER_GROUP_SUFFIX ")" ++#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52) ++ ++/* just filter building stuff */ ++#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1) ++#define REQUEST_GROUP(buffer, prefilter, pwname) \ ++ buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return FAILURE; \ ++ } \ ++ snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname) ++/* ++XXX OLD group building macros ++#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46) ++#define REQUEST_GROUP(buffer,pwname,grp) \ ++ buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return FAILURE; \ ++ } \ ++ snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname) ++ */ ++ ++/* ++XXX stock upstream version without extra filter support ++#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64) ++#define REQUEST_USER(buffer, pwname) \ ++ buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return NULL; \ ++ } \ ++ snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname) ++ */ ++ ++#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0)) ++#define REQUEST_USER(buffer, pwname, customfilter) \ ++ buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return NULL; \ ++ } \ ++ snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \ ++ "(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \ ++ pwname, (customfilter != NULL ? customfilter : "")) ++ ++/* some portable and working tokenizer, lame though */ ++static int tokenize(char ** o, size_t size, char * input) { ++ unsigned int i = 0, num; ++ const char * charset = " \t"; ++ char * ptr = input; ++ ++ /* leading white spaces are ignored */ ++ num = strspn(ptr, charset); ++ ptr += num; ++ ++ while ((num = strcspn(ptr, charset))) { ++ if (i < size-1) { ++ o[i++] = ptr; ++ ptr += num; ++ if (*ptr) ++ *ptr++ = '\0'; ++ } ++ } ++ o[i] = NULL; ++ return SUCCESS; ++} ++ ++void ldap_close(ldap_opt_t * ldap) { ++ ++ if (!ldap) ++ return; ++ ++ if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0) ++ ldap_perror(ldap->ld, "ldap_unbind()"); ++ ++ ldap->ld = NULL; ++ FLAG_SET_DISCONNECTED(ldap->flags); ++ ++ return; ++} ++ ++/* init && bind */ ++int ldap_connect(ldap_opt_t * ldap) { ++ int version = LDAP_VERSION3; ++ ++ if (!ldap->servers) ++ return FAILURE; ++ ++ /* Connection Init and setup */ ++ ldap->ld = ldap_init(ldap->servers, LDAP_PORT); ++ if (!ldap->ld) { ++ ldap_perror(ldap->ld, "ldap_init()"); ++ return FAILURE; ++ } ++ ++ if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)"); ++ return FAILURE; ++ } ++ ++ /* Timeouts setup */ ++ if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)"); ++ } ++ if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)"); ++ } ++ ++ /* TLS support */ ++ if ( (ldap->tls == -1) || (ldap->tls == 1) ) { ++ if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) { ++ /* failed then reinit the initial connect */ ++ ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()"); ++ if (ldap->tls == 1) ++ return FAILURE; ++ ++ ldap->ld = ldap_init(ldap->servers, LDAP_PORT); ++ if (!ldap->ld) { ++ ldap_perror(ldap->ld, "ldap_init()"); ++ return FAILURE; ++ } ++ ++ if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option()"); ++ return FAILURE; ++ } ++ } ++ } ++ ++ ++ if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_simple_bind_s()"); ++ return FAILURE; ++ } ++ ++ /* says it is connected */ ++ FLAG_SET_CONNECTED(ldap->flags); ++ ++ return SUCCESS; ++} ++ ++/* must free allocated ressource */ ++static char * ldap_build_host(char *host, int port) { ++ unsigned int size = strlen(host)+11; ++ char * h = (char *) calloc (size, sizeof(char)); ++ int rc; ++ if (!h) ++ return NULL; ++ ++ rc = snprintf(h, size, "%s:%d ", host, port); ++ if (rc == -1) ++ return NULL; ++ return h; ++} ++ ++static int ldap_count_group(const char * input) { ++ const char * charset = " \t"; ++ const char * ptr = input; ++ unsigned int count = 0; ++ unsigned int num; ++ ++ num = strspn(ptr, charset); ++ ptr += num; ++ ++ while ((num = strcspn(ptr, charset))) { ++ count++; ++ ptr += num; ++ ptr++; ++ } ++ ++ return count; ++} ++ ++/* format filter */ ++char * ldap_parse_groups(const char * groups) { ++ unsigned int buffer_size = FILTER_GROUP_SIZE(groups); ++ char * buffer = (char *) calloc(buffer_size, sizeof(char)); ++ char * g = NULL; ++ char * garray[32]; ++ unsigned int i = 0; ++ ++ if ((!groups)||(!buffer)) ++ return NULL; ++ ++ g = strdup(groups); ++ if (!g) { ++ free(buffer); ++ return NULL; ++ } ++ ++ /* first separate into n tokens */ ++ if ( tokenize(garray, sizeof(garray)/sizeof(*garray), g) < 0) { ++ free(g); ++ free(buffer); ++ return NULL; ++ } ++ ++ /* build the final filter format */ ++ strlcat(buffer, FILTER_GROUP_PREFIX, buffer_size); ++ strlcat(buffer, FILTER_OR_PREFIX, buffer_size); ++ i = 0; ++ while (garray[i]) { ++ strlcat(buffer, FILTER_CN_PREFIX, buffer_size); ++ strlcat(buffer, garray[i], buffer_size); ++ strlcat(buffer, FILTER_CN_SUFFIX, buffer_size); ++ i++; ++ } ++ strlcat(buffer, FILTER_OR_SUFFIX, buffer_size); ++ strlcat(buffer, FILTER_UID_FORMAT, buffer_size); ++ strlcat(buffer, FILTER_GROUP_SUFFIX, buffer_size); ++ ++ free(g); ++ return buffer; ++} ++ ++/* a bit dirty but leak free */ ++char * ldap_parse_servers(const char * servers) { ++ char * s = NULL; ++ char * tmp = NULL, *urls[32]; ++ unsigned int num = 0 , i = 0 , asize = 0; ++ LDAPURLDesc *urld[32]; ++ ++ if (!servers) ++ return NULL; ++ ++ /* local copy of the arg */ ++ s = strdup(servers); ++ if (!s) ++ return NULL; ++ ++ /* first separate into URL tokens */ ++ if ( tokenize(urls, sizeof(urls)/sizeof(*urls), s) < 0) ++ return NULL; ++ ++ i = 0; ++ while (urls[i]) { ++ if (! ldap_is_ldap_url(urls[i]) || ++ (ldap_url_parse(urls[i], &urld[i]) != 0)) { ++ return NULL; ++ } ++ i++; ++ } ++ ++ /* now free(s) */ ++ free (s); ++ ++ /* how much memory do we need */ ++ num = i; ++ for (i = 0 ; i < num ; i++) ++ asize += strlen(urld[i]->lud_host)+11; ++ ++ /* alloc */ ++ s = (char *) calloc( asize+1 , sizeof(char)); ++ if (!s) { ++ for (i = 0 ; i < num ; i++) ++ ldap_free_urldesc(urld[i]); ++ return NULL; ++ } ++ ++ /* then build the final host string */ ++ for (i = 0 ; i < num ; i++) { ++ /* built host part */ ++ tmp = ldap_build_host(urld[i]->lud_host, urld[i]->lud_port); ++ strncat(s, tmp, strlen(tmp)); ++ ldap_free_urldesc(urld[i]); ++ free(tmp); ++ } ++ ++ return s; ++} ++ ++void ldap_options_print(ldap_opt_t * ldap) { ++ debug("ldap options:"); ++ debug("servers: %s", ldap->servers); ++ if (ldap->u_basedn) ++ debug("user basedn: %s", ldap->u_basedn); ++ if (ldap->g_basedn) ++ debug("group basedn: %s", ldap->g_basedn); ++ if (ldap->binddn) ++ debug("binddn: %s", ldap->binddn); ++ if (ldap->bindpw) ++ debug("bindpw: %s", ldap->bindpw); ++ if (ldap->sgroup) ++ debug("group: %s", ldap->sgroup); ++ if (ldap->filter) ++ debug("filter: %s", ldap->filter); ++} ++ ++void ldap_options_free(ldap_opt_t * l) { ++ if (!l) ++ return; ++ if (l->servers) ++ free(l->servers); ++ if (l->u_basedn) ++ free(l->u_basedn); ++ if (l->g_basedn) ++ free(l->g_basedn); ++ if (l->binddn) ++ free(l->binddn); ++ if (l->bindpw) ++ free(l->bindpw); ++ if (l->sgroup) ++ free(l->sgroup); ++ if (l->fgroup) ++ free(l->fgroup); ++ if (l->filter) ++ free(l->filter); ++ if (l->l_conf) ++ free(l->l_conf); ++ free(l); ++} ++ ++/* free keys */ ++void ldap_keys_free(ldap_key_t * k) { ++ ldap_value_free_len(k->keys); ++ free(k); ++ return; ++} ++ ++ldap_key_t * ldap_getuserkey(ldap_opt_t *l, const char * user) { ++ ldap_key_t * k = (ldap_key_t *) calloc (1, sizeof(ldap_key_t)); ++ LDAPMessage *res, *e; ++ char * filter; ++ int i; ++ ++ if ((!k) || (!l)) ++ return NULL; ++ ++ /* Am i still connected ? RETRY n times */ ++ /* XXX TODO: setup some conf value for retrying */ ++ if (!(l->flags & FLAG_CONNECTED)) ++ for (i = 0 ; i < 2 ; i++) ++ if (ldap_connect(l) == 0) ++ break; ++ ++ /* quick check for attempts to be evil */ ++ if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) || ++ (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL)) ++ return NULL; ++ ++ /* build filter for LDAP request */ ++ REQUEST_USER(filter, user, l->filter); ++ ++ if ( ldap_search_st( l->ld, ++ l->u_basedn, ++ LDAP_SCOPE_SUBTREE, ++ filter, ++ attrs, 0, &l->s_timeout, &res ) != LDAP_SUCCESS) { ++ ++ ldap_perror(l->ld, "ldap_search_st()"); ++ ++ free(filter); ++ free(k); ++ ++ /* XXX error on search, timeout etc.. close ask for reconnect */ ++ ldap_close(l); ++ ++ return NULL; ++ } ++ ++ /* free */ ++ free(filter); ++ ++ /* check if any results */ ++ i = ldap_count_entries(l->ld,res); ++ if (i <= 0) { ++ ldap_msgfree(res); ++ free(k); ++ return NULL; ++ } ++ ++ if (i > 1) ++ debug("[LDAP] duplicate entries, using the FIRST entry returned"); ++ ++ e = ldap_first_entry(l->ld, res); ++ k->keys = ldap_get_values_len(l->ld, e, PUBKEYATTR); ++ k->num = ldap_count_values_len(k->keys); ++ ++ ldap_msgfree(res); ++ return k; ++} ++ ++ ++/* -1 if trouble ++ 0 if user is NOT member of current server group ++ 1 if user IS MEMBER of current server group ++ */ ++int ldap_ismember(ldap_opt_t * l, const char * user) { ++ LDAPMessage *res; ++ char * filter; ++ int i; ++ ++ if ((!l->sgroup) || !(l->g_basedn)) ++ return 1; ++ ++ /* Am i still connected ? RETRY n times */ ++ /* XXX TODO: setup some conf value for retrying */ ++ if (!(l->flags & FLAG_CONNECTED)) ++ for (i = 0 ; i < 2 ; i++) ++ if (ldap_connect(l) == 0) ++ break; ++ ++ /* quick check for attempts to be evil */ ++ if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) || ++ (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL)) ++ return FAILURE; ++ ++ /* build filter for LDAP request */ ++ REQUEST_GROUP(filter, l->fgroup, user); ++ ++ if (ldap_search_st( l->ld, ++ l->g_basedn, ++ LDAP_SCOPE_SUBTREE, ++ filter, ++ NULL, 0, &l->s_timeout, &res) != LDAP_SUCCESS) { ++ ++ ldap_perror(l->ld, "ldap_search_st()"); ++ ++ free(filter); ++ ++ /* XXX error on search, timeout etc.. close ask for reconnect */ ++ ldap_close(l); ++ ++ return FAILURE; ++ } ++ ++ free(filter); ++ ++ /* check if any results */ ++ if (ldap_count_entries(l->ld, res) > 0) { ++ ldap_msgfree(res); ++ return 1; ++ } ++ ++ ldap_msgfree(res); ++ return 0; ++} ++ ++/* ++ * ldap.conf simple parser ++ * XXX TODO: sanity checks ++ * must either ++ * - free the previous ldap_opt_before replacing entries ++ * - free each necessary previously parsed elements ++ * ret: ++ * -1 on FAILURE, 0 on SUCCESS ++ */ ++int ldap_parse_lconf(ldap_opt_t * l) { ++ FILE * lcd; /* ldap.conf descriptor */ ++ char buf[BUFSIZ]; ++ char * s = NULL, * k = NULL, * v = NULL; ++ int li, len; ++ ++ lcd = fopen (l->l_conf, "r"); ++ if (lcd == NULL) { ++ /* debug("Cannot open %s", l->l_conf); */ ++ perror("ldap_parse_lconf()"); ++ return FAILURE; ++ } ++ ++ while (fgets (buf, sizeof (buf), lcd) != NULL) { ++ ++ if (*buf == '\n' || *buf == '#') ++ continue; ++ ++ k = buf; ++ v = k; ++ while (*v != '\0' && *v != ' ' && *v != '\t') ++ v++; ++ ++ if (*v == '\0') ++ continue; ++ ++ *(v++) = '\0'; ++ ++ while (*v == ' ' || *v == '\t') ++ v++; ++ ++ li = strlen (v) - 1; ++ while (v[li] == ' ' || v[li] == '\t' || v[li] == '\n') ++ --li; ++ v[li + 1] = '\0'; ++ ++ if (!strcasecmp (k, "uri")) { ++ if ((l->servers = ldap_parse_servers(v)) == NULL) { ++ fatal("error in ldap servers"); ++ return FAILURE; ++ } ++ ++ } ++ else if (!strcasecmp (k, "base")) { ++ s = strchr (v, '?'); ++ if (s != NULL) { ++ len = s - v; ++ l->u_basedn = malloc (len + 1); ++ strncpy (l->u_basedn, v, len); ++ l->u_basedn[len] = '\0'; ++ } else { ++ l->u_basedn = strdup (v); ++ } ++ } ++ else if (!strcasecmp (k, "binddn")) { ++ l->binddn = strdup (v); ++ } ++ else if (!strcasecmp (k, "bindpw")) { ++ l->bindpw = strdup (v); ++ } ++ else if (!strcasecmp (k, "timelimit")) { ++ l->s_timeout.tv_sec = atoi (v); ++ } ++ else if (!strcasecmp (k, "bind_timelimit")) { ++ l->b_timeout.tv_sec = atoi (v); ++ } ++ else if (!strcasecmp (k, "ssl")) { ++ if (!strcasecmp (v, "start_tls")) ++ l->tls = 1; ++ } ++ } ++ ++ fclose (lcd); ++ return SUCCESS; ++} ++ ++#endif /* WITH_LDAP_PUBKEY */ +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/ldapauth.h openssh-5.2p1+lpk/ldapauth.h +--- openssh-5.2p1.orig/ldapauth.h 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1+lpk/ldapauth.h 2009-03-22 15:59:08.546217262 +0100 +@@ -0,0 +1,124 @@ ++/* ++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ ++ */ ++ ++/* ++ * ++ * Copyright (c) 2005, Eric AUGE ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: ++ * ++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, ++ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * ++ */ ++ ++#ifndef LDAPAUTH_H ++#define LDAPAUTH_H ++ ++#define LDAP_DEPRECATED 1 ++ ++#include ++#include ++#include ++#include ++ ++/* tokens in use for config */ ++#define _DEFAULT_LPK_TOKEN "UseLPK" ++#define _DEFAULT_SRV_TOKEN "LpkServers" ++#define _DEFAULT_USR_TOKEN "LpkUserDN" ++#define _DEFAULT_GRP_TOKEN "LpkGroupDN" ++#define _DEFAULT_BDN_TOKEN "LpkBindDN" ++#define _DEFAULT_BPW_TOKEN "LpkBindPw" ++#define _DEFAULT_MYG_TOKEN "LpkServerGroup" ++#define _DEFAULT_FIL_TOKEN "LpkFilter" ++#define _DEFAULT_TLS_TOKEN "LpkForceTLS" ++#define _DEFAULT_BTI_TOKEN "LpkBindTimelimit" ++#define _DEFAULT_STI_TOKEN "LpkSearchTimelimit" ++#define _DEFAULT_LDP_TOKEN "LpkLdapConf" ++ ++/* default options */ ++#define _DEFAULT_LPK_ON 0 ++#define _DEFAULT_LPK_SERVERS NULL ++#define _DEFAULT_LPK_UDN NULL ++#define _DEFAULT_LPK_GDN NULL ++#define _DEFAULT_LPK_BINDDN NULL ++#define _DEFAULT_LPK_BINDPW NULL ++#define _DEFAULT_LPK_SGROUP NULL ++#define _DEFAULT_LPK_FILTER NULL ++#define _DEFAULT_LPK_TLS -1 ++#define _DEFAULT_LPK_BTIMEOUT 10 ++#define _DEFAULT_LPK_STIMEOUT 10 ++#define _DEFAULT_LPK_LDP NULL ++ ++/* flags */ ++#define FLAG_EMPTY 0x00000000 ++#define FLAG_CONNECTED 0x00000001 ++ ++/* flag macros */ ++#define FLAG_SET_EMPTY(x) x&=(FLAG_EMPTY) ++#define FLAG_SET_CONNECTED(x) x|=(FLAG_CONNECTED) ++#define FLAG_SET_DISCONNECTED(x) x&=~(FLAG_CONNECTED) ++ ++/* defines */ ++#define FAILURE -1 ++#define SUCCESS 0 ++#define PUBKEYATTR "sshPublicKey" ++ ++/* ++ * ++ * defined files path ++ * (should be relocated to pathnames.h, ++ * if one day it's included within the tree) ++ * ++ */ ++#define _PATH_LDAP_CONFIG_FILE "/etc/ldap.conf" ++ ++/* structures */ ++typedef struct ldap_options { ++ int on; /* Use it or NOT */ ++ LDAP * ld; /* LDAP file desc */ ++ char * servers; /* parsed servers for ldaplib failover handling */ ++ char * u_basedn; /* user basedn */ ++ char * g_basedn; /* group basedn */ ++ char * binddn; /* binddn */ ++ char * bindpw; /* bind password */ ++ char * sgroup; /* server group */ ++ char * fgroup; /* group filter */ ++ char * filter; /* additional filter */ ++ char * l_conf; /* use ldap.conf */ ++ int tls; /* TLS only */ ++ struct timeval b_timeout; /* bind timeout */ ++ struct timeval s_timeout; /* search timeout */ ++ unsigned int flags; /* misc flags (reconnection, future use?) */ ++} ldap_opt_t; ++ ++typedef struct ldap_keys { ++ struct berval ** keys; /* the public keys retrieved */ ++ unsigned int num; /* number of keys */ ++} ldap_key_t; ++ ++ ++/* function headers */ ++void ldap_close(ldap_opt_t *); ++int ldap_connect(ldap_opt_t *); ++char * ldap_parse_groups(const char *); ++char * ldap_parse_servers(const char *); ++void ldap_options_print(ldap_opt_t *); ++void ldap_options_free(ldap_opt_t *); ++void ldap_keys_free(ldap_key_t *); ++int ldap_parse_lconf(ldap_opt_t *); ++ldap_key_t * ldap_getuserkey(ldap_opt_t *, const char *); ++int ldap_ismember(ldap_opt_t *, const char *); ++ ++#endif +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/lpk-user-example.txt openssh-5.2p1+lpk/lpk-user-example.txt +--- openssh-5.2p1.orig/lpk-user-example.txt 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1+lpk/lpk-user-example.txt 2009-03-22 15:59:08.575379694 +0100 +@@ -0,0 +1,117 @@ ++ ++Post to ML -> User Made Quick Install Doc. ++Contribution from John Lane ++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ ++OpenSSH LDAP keystore Patch ++=========================== ++ ++NOTE: these notes are a transcript of a specific installation ++ they work for me, your specifics may be different! ++ from John Lane March 17th 2005 john at lane.uk.net ++ ++This is a patch to OpenSSH 4.0p1 to allow it to obtain users' public keys ++from their LDAP record as an alternative to ~/.ssh/authorized_keys. ++ ++(Assuming here that necessary build stuff is in $BUILD) ++ ++cd $BUILD/openssh-4.0p1 ++patch -Np1 -i $BUILD/openssh-lpk-4.0p1-0.3.patch ++mkdir -p /var/empty && ++./configure --prefix=/usr --sysconfdir=/etc/ssh \ ++ --libexecdir=/usr/sbin --with-md5-passwords --with-pam \ ++ --with-libs="-lldap" --with-cppflags="-DWITH_LDAP_PUBKEY" ++Now do. ++make && ++make install ++ ++Add the following config to /etc/ssh/ssh_config ++UseLPK yes ++LpkServers ldap://myhost.mydomain.com ++LpkUserDN ou=People,dc=mydomain,dc=com ++ ++We need to tell sshd about the SSL keys during boot, as root's ++environment does not exist at that time. Edit /etc/rc.d/init.d/sshd. ++Change the startup code from this: ++ echo "Starting SSH Server..." ++ loadproc /usr/sbin/sshd ++ ;; ++to this: ++ echo "Starting SSH Server..." ++ LDAPRC="/root/.ldaprc" loadproc /usr/sbin/sshd ++ ;; ++ ++Re-start the sshd daemon: ++/etc/rc.d/init.d/sshd restart ++ ++Install the additional LDAP schema ++cp $BUILD/openssh-lpk-0.2.schema /etc/openldap/schema/openssh.schema ++ ++Now add the openSSH LDAP schema to /etc/openldap/slapd.conf: ++Add the following to the end of the existing block of schema includes ++include /etc/openldap/schema/openssh.schema ++ ++Re-start the LDAP server: ++/etc/rc.d/init.d/slapd restart ++ ++To add one or more public keys to a user, eg "testuser" : ++ldapsearch -x -W -Z -LLL -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D ++"uid=testuser,ou=People,dc=mydomain,dc=com" > /tmp/testuser ++ ++append the following to this /tmp/testuser file ++objectclass: ldapPublicKey ++sshPublicKey: ssh-rsa ++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KS ++qIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z8XwSsuAoR1t86t+5dlI ++7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key ++ ++Then do a modify: ++ldapmodify -x -D "uid=testuser,ou=People,dc=mydomain,dc=com" -W -f ++/tmp/testuser -Z ++Enter LDAP Password: ++modifying entry "uid=testuser,ou=People,dc=mydomain,dc=com" ++And check the modify is ok: ++ldapsearch -x -W -Z -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D ++"uid=testuser,ou=People,dc=mydomain,dc=com" ++Enter LDAP Password: ++# extended LDIF ++# ++# LDAPv3 ++# base with scope sub ++# filter: (objectclass=*) ++# requesting: ALL ++# ++ ++# testuser, People, mydomain.com ++dn: uid=testuser,ou=People,dc=mydomain,dc=com ++uid: testuser ++cn: testuser ++objectClass: account ++objectClass: posixAccount ++objectClass: top ++objectClass: shadowAccount ++objectClass: ldapPublicKey ++shadowLastChange: 12757 ++shadowMax: 99999 ++shadowWarning: 7 ++loginShell: /bin/bash ++uidNumber: 9999 ++gidNumber: 501 ++homeDirectory: /home/testuser ++userPassword:: e1NTSEF9UDgwV1hnM1VjUDRJK0k1YnFiL1d4ZUJObXlZZ3Z3UTU= ++sshPublicKey: ssh-rsa ++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KSqIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z ++8XwSsuAoR1t86t+5dlI7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key ++ ++# search result ++search: 3 ++result: 0 Success ++ ++# numResponses: 2 ++# numEntries: 1 ++ ++Now start a ssh session to user "testuser" from usual ssh client (e.g. ++puTTY). Login should succeed. ++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/openssh-lpk_openldap.schema openssh-5.2p1+lpk/openssh-lpk_openldap.schema +--- openssh-5.2p1.orig/openssh-lpk_openldap.schema 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1+lpk/openssh-lpk_openldap.schema 2009-03-22 15:59:08.635476950 +0100 +@@ -0,0 +1,19 @@ ++# ++# LDAP Public Key Patch schema for use with openssh-ldappubkey ++# Author: Eric AUGE ++# ++# Based on the proposal of : Mark Ruijter ++# ++ ++ ++# octetString SYNTAX ++attributetype ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' ++ DESC 'MANDATORY: OpenSSH Public key' ++ EQUALITY octetStringMatch ++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) ++ ++# printableString SYNTAX yes|no ++objectclass ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY ++ DESC 'MANDATORY: OpenSSH LPK objectclass' ++ MUST ( sshPublicKey $ uid ) ++ ) +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/openssh-lpk_sun.schema openssh-5.2p1+lpk/openssh-lpk_sun.schema +--- openssh-5.2p1.orig/openssh-lpk_sun.schema 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1+lpk/openssh-lpk_sun.schema 2009-03-22 15:59:08.653640345 +0100 +@@ -0,0 +1,21 @@ ++# ++# LDAP Public Key Patch schema for use with openssh-ldappubkey ++# Author: Eric AUGE ++# ++# Schema for Sun Directory Server. ++# Based on the original schema, modified by Stefan Fischer. ++# ++ ++dn: cn=schema ++ ++# octetString SYNTAX ++attributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' ++ DESC 'MANDATORY: OpenSSH Public key' ++ EQUALITY octetStringMatch ++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) ++ ++# printableString SYNTAX yes|no ++objectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY ++ DESC 'MANDATORY: OpenSSH LPK objectclass' ++ MUST ( sshPublicKey $ uid ) ++ ) +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/servconf.c openssh-5.2p1+lpk/servconf.c +--- openssh-5.2p1.orig/servconf.c 2009-01-28 06:31:23.000000000 +0100 ++++ openssh-5.2p1+lpk/servconf.c 2009-03-22 16:02:52.456008387 +0100 +@@ -42,6 +42,10 @@ + #include "channels.h" + #include "groupaccess.h" + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + static void add_listen_addr(ServerOptions *, char *, int); + static void add_one_listen_addr(ServerOptions *, char *, int); + +@@ -128,6 +132,25 @@ + options->adm_forced_command = NULL; + options->chroot_directory = NULL; + options->zero_knowledge_password_authentication = -1; ++#ifdef WITH_LDAP_PUBKEY ++ /* XXX dirty */ ++ options->lpk.ld = NULL; ++ options->lpk.on = -1; ++ options->lpk.servers = NULL; ++ options->lpk.u_basedn = NULL; ++ options->lpk.g_basedn = NULL; ++ options->lpk.binddn = NULL; ++ options->lpk.bindpw = NULL; ++ options->lpk.sgroup = NULL; ++ options->lpk.filter = NULL; ++ options->lpk.fgroup = NULL; ++ options->lpk.l_conf = NULL; ++ options->lpk.tls = -1; ++ options->lpk.b_timeout.tv_sec = -1; ++ options->lpk.s_timeout.tv_sec = -1; ++ options->lpk.flags = FLAG_EMPTY; ++#endif ++ + } + + void +@@ -261,8 +284,34 @@ + options->permit_tun = SSH_TUNMODE_NO; + if (options->zero_knowledge_password_authentication == -1) + options->zero_knowledge_password_authentication = 0; ++#ifdef WITH_LDAP_PUBKEY ++ if (options->lpk.on == -1) ++ options->lpk.on = _DEFAULT_LPK_ON; ++ if (options->lpk.servers == NULL) ++ options->lpk.servers = _DEFAULT_LPK_SERVERS; ++ if (options->lpk.u_basedn == NULL) ++ options->lpk.u_basedn = _DEFAULT_LPK_UDN; ++ if (options->lpk.g_basedn == NULL) ++ options->lpk.g_basedn = _DEFAULT_LPK_GDN; ++ if (options->lpk.binddn == NULL) ++ options->lpk.binddn = _DEFAULT_LPK_BINDDN; ++ if (options->lpk.bindpw == NULL) ++ options->lpk.bindpw = _DEFAULT_LPK_BINDPW; ++ if (options->lpk.sgroup == NULL) ++ options->lpk.sgroup = _DEFAULT_LPK_SGROUP; ++ if (options->lpk.filter == NULL) ++ options->lpk.filter = _DEFAULT_LPK_FILTER; ++ if (options->lpk.tls == -1) ++ options->lpk.tls = _DEFAULT_LPK_TLS; ++ if (options->lpk.b_timeout.tv_sec == -1) ++ options->lpk.b_timeout.tv_sec = _DEFAULT_LPK_BTIMEOUT; ++ if (options->lpk.s_timeout.tv_sec == -1) ++ options->lpk.s_timeout.tv_sec = _DEFAULT_LPK_STIMEOUT; ++ if (options->lpk.l_conf == NULL) ++ options->lpk.l_conf = _DEFAULT_LPK_LDP; ++#endif + +- /* Turn privilege separation on by default */ ++ /* Turn privilege separation on by default */ + if (use_privsep == -1) + use_privsep = 1; + +@@ -307,6 +356,12 @@ + sUsePrivilegeSeparation, sAllowAgentForwarding, + sZeroKnowledgePasswordAuthentication, + sDeprecated, sUnsupported ++#ifdef WITH_LDAP_PUBKEY ++ ,sLdapPublickey, sLdapServers, sLdapUserDN ++ ,sLdapGroupDN, sBindDN, sBindPw, sMyGroup ++ ,sLdapFilter, sForceTLS, sBindTimeout ++ ,sSearchTimeout, sLdapConf ++#endif + } ServerOpCodes; + + #define SSHCFG_GLOBAL 0x01 /* allowed in main section of sshd_config */ +@@ -417,6 +472,20 @@ + { "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL }, + { "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL }, + { "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL }, ++#ifdef WITH_LDAP_PUBKEY ++ { _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL }, ++ { _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL }, ++ { _DEFAULT_USR_TOKEN, sLdapUserDN, SSHCFG_GLOBAL }, ++ { _DEFAULT_GRP_TOKEN, sLdapGroupDN, SSHCFG_GLOBAL }, ++ { _DEFAULT_BDN_TOKEN, sBindDN, SSHCFG_GLOBAL }, ++ { _DEFAULT_BPW_TOKEN, sBindPw, SSHCFG_GLOBAL }, ++ { _DEFAULT_MYG_TOKEN, sMyGroup, SSHCFG_GLOBAL }, ++ { _DEFAULT_FIL_TOKEN, sLdapFilter, SSHCFG_GLOBAL }, ++ { _DEFAULT_TLS_TOKEN, sForceTLS, SSHCFG_GLOBAL }, ++ { _DEFAULT_BTI_TOKEN, sBindTimeout, SSHCFG_GLOBAL }, ++ { _DEFAULT_STI_TOKEN, sSearchTimeout, SSHCFG_GLOBAL }, ++ { _DEFAULT_LDP_TOKEN, sLdapConf, SSHCFG_GLOBAL }, ++#endif + { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL }, + { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL }, + { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL }, +@@ -1307,6 +1376,107 @@ + while (arg) + arg = strdelim(&cp); + break; ++#ifdef WITH_LDAP_PUBKEY ++ case sLdapPublickey: ++ intptr = &options->lpk.on; ++ goto parse_flag; ++ case sLdapServers: ++ /* arg = strdelim(&cp); */ ++ p = line; ++ while(*p++); ++ arg = p; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing ldap server",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ if ((options->lpk.servers = ldap_parse_servers(arg)) == NULL) ++ fatal("%s line %d: error in ldap servers", filename, linenum); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sLdapUserDN: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing ldap server",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.u_basedn = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sLdapGroupDN: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing ldap server",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.g_basedn = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sBindDN: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing binddn",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.binddn = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sBindPw: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing bindpw",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.bindpw = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sMyGroup: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing groupname",filename, linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.sgroup = xstrdup(arg); ++ if (options->lpk.sgroup) ++ options->lpk.fgroup = ldap_parse_groups(options->lpk.sgroup); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sLdapFilter: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing filter",filename, linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.filter = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sForceTLS: ++ intptr = &options->lpk.tls; ++ arg = strdelim(&cp); ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing yes/no argument.", ++ filename, linenum); ++ value = 0; /* silence compiler */ ++ if (strcmp(arg, "yes") == 0) ++ value = 1; ++ else if (strcmp(arg, "no") == 0) ++ value = 0; ++ else if (strcmp(arg, "try") == 0) ++ value = -1; ++ else ++ fatal("%s line %d: Bad yes/no argument: %s", ++ filename, linenum, arg); ++ if (*intptr == -1) ++ *intptr = value; ++ break; ++ case sBindTimeout: ++ intptr = (int *) &options->lpk.b_timeout.tv_sec; ++ goto parse_int; ++ case sSearchTimeout: ++ intptr = (int *) &options->lpk.s_timeout.tv_sec; ++ goto parse_int; ++ break; ++ case sLdapConf: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing LpkLdapConf", filename, linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.l_conf = xstrdup(arg); ++ memset(arg, 0, strlen(arg)); ++ break; ++#endif + + default: + fatal("%s line %d: Missing handler for opcode %s (%d)", +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/servconf.h openssh-5.2p1+lpk/servconf.h +--- openssh-5.2p1.orig/servconf.h 2009-01-28 06:31:23.000000000 +0100 ++++ openssh-5.2p1+lpk/servconf.h 2009-03-22 15:59:08.809800401 +0100 +@@ -16,6 +16,10 @@ + #ifndef SERVCONF_H + #define SERVCONF_H + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + #define MAX_PORTS 256 /* Max # ports. */ + + #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ +@@ -147,6 +151,9 @@ + int use_pam; /* Enable auth via PAM */ + + int permit_tun; ++#ifdef WITH_LDAP_PUBKEY ++ ldap_opt_t lpk; ++#endif + + int num_permitted_opens; + +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/sshd.c openssh-5.2p1+lpk/sshd.c +--- openssh-5.2p1.orig/sshd.c 2009-01-28 06:31:23.000000000 +0100 ++++ openssh-5.2p1+lpk/sshd.c 2009-03-22 15:59:08.862544731 +0100 +@@ -126,6 +126,10 @@ + int deny_severity; + #endif /* LIBWRAP */ + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + #ifndef O_NOCTTY + #define O_NOCTTY 0 + #endif +@@ -1483,6 +1487,16 @@ + exit(1); + } + ++#ifdef WITH_LDAP_PUBKEY ++ /* ldap_options_print(&options.lpk); */ ++ /* XXX initialize/check ldap connection and set *LD */ ++ if (options.lpk.on) { ++ if (options.lpk.l_conf && (ldap_parse_lconf(&options.lpk) < 0) ) ++ error("[LDAP] could not parse %s", options.lpk.l_conf); ++ if (ldap_connect(&options.lpk) < 0) ++ error("[LDAP] could not initialize ldap connection"); ++ } ++#endif + debug("sshd version %.100s", SSH_RELEASE); + + /* Store privilege separation user for later use if required. */ +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/sshd_config openssh-5.2p1+lpk/sshd_config +--- openssh-5.2p1.orig/sshd_config 2008-07-02 14:35:43.000000000 +0200 ++++ openssh-5.2p1+lpk/sshd_config 2009-03-22 15:59:08.899356863 +0100 +@@ -109,6 +109,21 @@ + # no default banner path + #Banner none + ++# here are the new patched ldap related tokens ++# entries in your LDAP must have posixAccount & ldapPublicKey objectclass ++#UseLPK yes ++#LpkLdapConf /etc/ldap.conf ++#LpkServers ldap://10.1.7.1/ ldap://10.1.7.2/ ++#LpkUserDN ou=users,dc=phear,dc=org ++#LpkGroupDN ou=groups,dc=phear,dc=org ++#LpkBindDN cn=Manager,dc=phear,dc=org ++#LpkBindPw secret ++#LpkServerGroup mail ++#LpkFilter (hostAccess=master.phear.org) ++#LpkForceTLS no ++#LpkSearchTimelimit 3 ++#LpkBindTimelimit 3 ++ + # override default of no subsystems + Subsystem sftp /usr/libexec/sftp-server + +diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/sshd_config.5 openssh-5.2p1+lpk/sshd_config.5 +--- openssh-5.2p1.orig/sshd_config.5 2009-02-23 01:00:24.000000000 +0100 ++++ openssh-5.2p1+lpk/sshd_config.5 2009-03-22 15:59:08.944067497 +0100 +@@ -1005,6 +1005,62 @@ + program. + The default is + .Pa /usr/X11R6/bin/xauth . ++.It Cm UseLPK ++Specifies whether LDAP public key retrieval must be used or not. It allow ++an easy centralisation of public keys within an LDAP directory. The argument must be ++.Dq yes ++or ++.Dq no . ++.It Cm LpkLdapConf ++Specifies whether LDAP Public keys should parse the specified ldap.conf file ++instead of sshd_config Tokens. The argument must be a valid path to an ldap.conf ++file like ++.Pa /etc/ldap.conf ++.It Cm LpkServers ++Specifies LDAP one or more [:space:] separated server's url the following form may be used: ++.Pp ++LpkServers ldaps://127.0.0.1 ldap://127.0.0.2 ldap://127.0.0.3 ++.It Cm LpkUserDN ++Specifies the LDAP user DN. ++.Pp ++LpkUserDN ou=users,dc=phear,dc=org ++.It Cm LpkGroupDN ++Specifies the LDAP groups DN. ++.Pp ++LpkGroupDN ou=groups,dc=phear,dc=org ++.It Cm LpkBindDN ++Specifies the LDAP bind DN to use if necessary. ++.Pp ++LpkBindDN cn=Manager,dc=phear,dc=org ++.It Cm LpkBindPw ++Specifies the LDAP bind credential. ++.Pp ++LpkBindPw secret ++.It Cm LpkServerGroup ++Specifies one or more [:space:] separated group the server is part of. ++.Pp ++LpkServerGroup unix mail prod ++.It Cm LpkFilter ++Specifies an additional LDAP filter to use for finding SSH keys ++.Pp ++LpkFilter (hostAccess=master.phear.org) ++.It Cm LpkForceTLS ++Specifies if the LDAP server connection must be tried, forced or not used. The argument must be ++.Dq yes ++or ++.Dq no ++or ++.Dq try . ++.It Cm LpkSearchTimelimit ++Sepcifies the search time limit before the search is considered over. value is ++in seconds. ++.Pp ++LpkSearchTimelimit 3 ++.It Cm LpkBindTimelimit ++Sepcifies the bind time limit before the connection is considered dead. value is ++in seconds. ++.Pp ++LpkBindTimelimit 3 + .El + .Sh TIME FORMATS + .Xr sshd 8 Modified: csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch 2009-03-22 15:28:31 UTC (rev 3861) +++ csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch 2009-03-22 16:37:35 UTC (rev 3862) @@ -1,6 +1,6 @@ diff --speed-large-files --minimal -Nru sshpty.c.orig openssh-4.7p1/sshpty.c ---- sshpty.c.orig 2006-08-04 22:39:41.000000000 -0400 -+++ sshpty.c 2007-11-02 17:56:19.136541000 -0400 +--- openssh-5.2p1/sshpty.c.orig 2006-08-04 22:39:41.000000000 -0400 ++++ openssh-5.2p1.new/sshpty.c 2007-11-02 17:56:19.136541000 -0400 @@ -139,7 +139,10 @@ close(fd); } Modified: csw/mgar/pkg/openssh/trunk/files/no_x_forwarding_bug.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/no_x_forwarding_bug.patch 2009-03-22 15:28:31 UTC (rev 3861) +++ csw/mgar/pkg/openssh/trunk/files/no_x_forwarding_bug.patch 2009-03-22 16:37:35 UTC (rev 3862) @@ -1,6 +1,6 @@ diff --speed-large-files --minimal -Nru openssh-5.0p1.orig/channels.c openssh-5.0p1/channels.c ---- channels.c 2008-04-02 17:43:57.000000000 -0400 -+++ channels.c 2008-04-30 08:32:59.300403974 -0400 +--- openssh-5.2p1/channels.c 2008-04-02 17:43:57.000000000 -0400 ++++ openssh-5.2p1.new/channels.c 2008-04-30 08:32:59.300403974 -0400 @@ -2906,6 +2906,9 @@ debug2("bind port %d: %.100s", port, strerror(errno)); close(sock); Modified: csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-03-22 15:28:31 UTC (rev 3861) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.2p1-gsskex-20081003.patch 2009-03-22 16:37:35 UTC (rev 3862) @@ -1,6 +1,6 @@ diff -urN ChangeLog.gssapi ChangeLog.gssapi ---- ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200 +--- openssh-5.2p1/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.2p1.new/ChangeLog.gssapi 2008-10-03 21:03:11.484172000 +0200 @@ -0,0 +1,75 @@ +20080404 + - [ gss-serv.c ] @@ -78,8 +78,8 @@ + (from jbasney AT ncsa.uiuc.edu) + diff -urN openssh-5.2p1/Makefile.in openssh-5.2p1.new/Makefile.in ---- Makefile.in 2008-11-05 06:20:46.000000000 +0100 -+++ Makefile.in 2009-03-21 15:39:14.000000000 +0100 +--- openssh-5.2p1/Makefile.in 2008-11-05 06:20:46.000000000 +0100 ++++ openssh-5.2p1.new/Makefile.in 2009-03-21 15:39:14.000000000 +0100 @@ -71,7 +71,7 @@ atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ @@ -99,8 +99,8 @@ audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o diff -urN openssh-5.2p1/auth-krb5.c openssh-5.2p1.new/auth-krb5.c ---- auth-krb5.c 2006-08-05 04:39:39.000000000 +0200 -+++ auth-krb5.c 2009-03-21 15:19:18.000000000 +0100 +--- openssh-5.2p1/auth-krb5.c 2006-08-05 04:39:39.000000000 +0200 ++++ openssh-5.2p1.new/auth-krb5.c 2009-03-21 15:19:18.000000000 +0100 @@ -166,8 +166,13 @@ len = strlen(authctxt->krb5_ticket_file) + 6; @@ -149,8 +149,8 @@ return (krb5_cc_resolve(ctx, ccname, ccache)); } diff -urN openssh-5.2p1/auth.h openssh-5.2p1.new/auth.h ---- auth.h 2008-11-05 06:20:46.000000000 +0100 -+++ auth.h 2009-03-21 15:19:18.000000000 +0100 +--- openssh-5.2p1/auth.h 2008-11-05 06:20:46.000000000 +0100 ++++ openssh-5.2p1.new/auth.h 2009-03-21 15:19:18.000000000 +0100 @@ -53,6 +53,7 @@ int valid; /* user exists and is allowed to login */ int attempt; @@ -160,8 +160,8 @@ char *user; /* username sent by the client */ char *service; diff -urN openssh-5.2p1/auth2-gss.c openssh-5.2p1.new/auth2-gss.c ---- auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ auth2-gss.c 2009-03-21 15:19:18.000000000 +0100 +--- openssh-5.2p1/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 ++++ openssh-5.2p1.new/auth2-gss.c 2009-03-21 15:19:18.000000000 +0100 @@ -52,6 +52,39 @@ static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); static void input_gssapi_errtok(int, u_int32_t, void *); @@ -232,8 +232,8 @@ "gssapi-with-mic", userauth_gssapi, diff -urN openssh-5.2p1/auth2.c openssh-5.2p1.new/auth2.c ---- auth2.c 2008-11-05 06:20:46.000000000 +0100 -+++ auth2.c 2009-03-21 15:19:18.000000000 +0100 +--- openssh-5.2p1/auth2.c 2008-11-05 06:20:46.000000000 +0100 ++++ openssh-5.2p1.new/auth2.c 2009-03-21 15:19:18.000000000 +0100 @@ -69,6 +69,7 @@ extern Authmethod method_kbdint; extern Authmethod method_hostbased; @@ -270,8 +270,8 @@ PRIVSEP(audit_event(SSH_LOGIN_EXCEED_MAXTRIES)); #endif diff -urN openssh-5.2p1/configure.ac openssh-5.2p1.new/configure.ac ---- configure.ac 2009-02-16 05:37:03.000000000 +0100 -+++ configure.ac 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/configure.ac 2009-02-16 05:37:03.000000000 +0100 ++++ openssh-5.2p1.new/configure.ac 2009-03-21 15:19:19.000000000 +0100 @@ -473,6 +473,30 @@ [Use tunnel device compatibility to OpenBSD]) AC_DEFINE(SSH_TUN_PREPEND_AF, 1, @@ -304,8 +304,8 @@ AC_CHECK_DECL(AU_IPv4, [], AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) diff -urN openssh-5.2p1/gss-genr.c openssh-5.2p1.new/gss-genr.c ---- gss-genr.c 2007-06-12 15:44:36.000000000 +0200 -+++ gss-genr.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/gss-genr.c 2007-06-12 15:44:36.000000000 +0200 ++++ openssh-5.2p1.new/gss-genr.c 2009-03-21 15:19:19.000000000 +0100 @@ -39,12 +39,160 @@ #include "buffer.h" #include "log.h" @@ -518,8 +518,8 @@ return (!GSS_ERROR(major)); diff -urN openssh-5.2p1/gss-serv-krb5.c openssh-5.2p1.new/gss-serv-krb5.c ---- gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 -+++ gss-serv-krb5.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 ++++ openssh-5.2p1.new/gss-serv-krb5.c 2009-03-21 15:19:19.000000000 +0100 @@ -120,6 +120,7 @@ krb5_principal princ; OM_uint32 maj_status, min_status; @@ -550,8 +550,8 @@ #ifdef USE_PAM if (options.use_pam) diff -urN openssh-5.2p1/gss-serv.c openssh-5.2p1.new/gss-serv.c ---- gss-serv.c 2008-05-19 07:05:07.000000000 +0200 -+++ gss-serv.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/gss-serv.c 2008-05-19 07:05:07.000000000 +0200 ++++ openssh-5.2p1.new/gss-serv.c 2009-03-21 15:19:19.000000000 +0100 @@ -1,7 +1,7 @@ /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ @@ -666,8 +666,8 @@ - #endif diff -urN openssh-5.2p1/kex.c openssh-5.2p1.new/kex.c ---- kex.c 2008-11-03 09:19:12.000000000 +0100 -+++ kex.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/kex.c 2008-11-03 09:19:12.000000000 +0100 ++++ openssh-5.2p1.new/kex.c 2009-03-21 15:19:19.000000000 +0100 @@ -49,6 +49,10 @@ #include "dispatch.h" #include "monitor.h" @@ -701,8 +701,8 @@ fatal("bad kex alg %s", k->name); } diff -urN openssh-5.2p1/kex.h openssh-5.2p1.new/kex.h ---- kex.h 2007-06-11 06:01:42.000000000 +0200 -+++ kex.h 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/kex.h 2007-06-11 06:01:42.000000000 +0200 ++++ openssh-5.2p1.new/kex.h 2009-03-21 15:19:19.000000000 +0100 @@ -64,6 +64,9 @@ KEX_DH_GRP14_SHA1, KEX_DH_GEX_SHA1, @@ -738,8 +738,8 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); diff -urN openssh-5.2p1/key.c openssh-5.2p1.new/key.c ---- key.c 2008-11-03 09:24:17.000000000 +0100 -+++ key.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/key.c 2008-11-03 09:24:17.000000000 +0100 ++++ openssh-5.2p1.new/key.c 2009-03-21 15:19:19.000000000 +0100 @@ -764,6 +764,8 @@ return KEY_RSA; } else if (strcmp(name, "ssh-dss") == 0) { @@ -750,8 +750,8 @@ debug2("key_type_from_name: unknown key type '%s'", name); return KEY_UNSPEC; diff -urN openssh-5.2p1/key.h openssh-5.2p1.new/key.h ---- key.h 2008-06-12 20:40:35.000000000 +0200 -+++ key.h 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/key.h 2008-06-12 20:40:35.000000000 +0200 ++++ openssh-5.2p1.new/key.h 2009-03-21 15:19:19.000000000 +0100 @@ -34,6 +34,7 @@ KEY_RSA1, KEY_RSA, @@ -761,8 +761,8 @@ }; enum fp_type { diff -urN openssh-5.2p1/monitor.c openssh-5.2p1.new/monitor.c ---- monitor.c 2009-02-14 06:33:31.000000000 +0100 -+++ monitor.c 2009-03-21 15:38:09.000000000 +0100 +--- openssh-5.2p1/monitor.c 2009-02-14 06:33:31.000000000 +0100 ++++ openssh-5.2p1.new/monitor.c 2009-03-21 15:38:09.000000000 +0100 @@ -170,6 +170,7 @@ int mm_answer_gss_accept_ctx(int, Buffer *); int mm_answer_gss_userok(int, Buffer *); @@ -879,8 +879,8 @@ #ifdef JPAKE diff -urN openssh-5.2p1/monitor.h openssh-5.2p1.new/monitor.h ---- monitor.h 2008-11-05 06:20:46.000000000 +0100 -+++ monitor.h 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/monitor.h 2008-11-05 06:20:46.000000000 +0100 ++++ openssh-5.2p1.new/monitor.h 2009-03-21 15:19:19.000000000 +0100 @@ -53,6 +53,7 @@ MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, @@ -890,8 +890,8 @@ MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, diff -urN openssh-5.2p1/monitor_wrap.c openssh-5.2p1.new/monitor_wrap.c ---- monitor_wrap.c 2008-11-05 06:20:47.000000000 +0100 -+++ monitor_wrap.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/monitor_wrap.c 2008-11-05 06:20:47.000000000 +0100 ++++ openssh-5.2p1.new/monitor_wrap.c 2009-03-21 15:19:19.000000000 +0100 @@ -1256,6 +1256,29 @@ debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); return (authenticated); @@ -923,8 +923,8 @@ #ifdef JPAKE diff -urN openssh-5.2p1/monitor_wrap.h openssh-5.2p1.new/monitor_wrap.h ---- monitor_wrap.h 2008-11-05 06:20:47.000000000 +0100 -+++ monitor_wrap.h 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/monitor_wrap.h 2008-11-05 06:20:47.000000000 +0100 ++++ openssh-5.2p1.new/monitor_wrap.h 2009-03-21 15:19:19.000000000 +0100 @@ -59,6 +59,7 @@ gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); int mm_ssh_gssapi_userok(char *user); @@ -934,8 +934,8 @@ #ifdef USE_PAM diff -urN openssh-5.2p1/readconf.c openssh-5.2p1.new/readconf.c ---- readconf.c 2009-02-14 06:28:21.000000000 +0100 -+++ readconf.c 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/readconf.c 2009-02-14 06:28:21.000000000 +0100 ++++ openssh-5.2p1.new/readconf.c 2009-03-21 15:19:19.000000000 +0100 @@ -127,6 +127,8 @@ oClearAllForwardings, oNoHostAuthenticationForLocalhost, oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, @@ -1003,8 +1003,8 @@ options->password_authentication = 1; if (options->kbd_interactive_authentication == -1) diff -urN openssh-5.2p1/readconf.h openssh-5.2p1.new/readconf.h ---- readconf.h 2009-02-14 06:28:21.000000000 +0100 -+++ readconf.h 2009-03-21 15:19:19.000000000 +0100 +--- openssh-5.2p1/readconf.h 2009-02-14 06:28:21.000000000 +0100 ++++ openssh-5.2p1.new/readconf.h 2009-03-21 15:19:19.000000000 +0100 @@ -44,7 +44,9 @@ int challenge_response_authentication; /* Try S/Key or TIS, authentication. */ @@ -1016,8 +1016,8 @@ * authentication. */ int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ diff -urN openssh-5.2p1/servconf.c openssh-5.2p1.new/servconf.c ---- servconf.c 2009-01-28 06:31:23.000000000 +0100 -+++ servconf.c 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/servconf.c 2009-01-28 06:31:23.000000000 +0100 ++++ openssh-5.2p1.new/servconf.c 2009-03-21 15:19:20.000000000 +0100 @@ -92,7 +92,9 @@ options->kerberos_ticket_cleanup = -1; options->kerberos_get_afs_token = -1; @@ -1086,8 +1086,8 @@ intptr = &options->password_authentication; goto parse_flag; diff -urN openssh-5.2p1/servconf.h openssh-5.2p1.new/servconf.h ---- servconf.h 2009-01-28 06:31:23.000000000 +0100 -+++ servconf.h 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/servconf.h 2009-01-28 06:31:23.000000000 +0100 ++++ openssh-5.2p1.new/servconf.h 2009-03-21 15:19:20.000000000 +0100 @@ -91,7 +91,9 @@ int kerberos_get_afs_token; /* If true, try to get AFS token if * authenticated with Kerberos. */ @@ -1099,8 +1099,8 @@ * authentication. */ int kbd_interactive_authentication; /* If true, permit */ diff -urN openssh-5.2p1/ssh-gss.h openssh-5.2p1.new/ssh-gss.h ---- ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ ssh-gss.h 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 ++++ openssh-5.2p1.new/ssh-gss.h 2009-03-21 15:19:20.000000000 +0100 @@ -60,6 +60,17 @@ #define SSH_GSS_OIDTYPE 0x06 @@ -1149,8 +1149,8 @@ #endif /* _SSH_GSS_H */ diff -urN openssh-5.2p1/ssh_config openssh-5.2p1.new/ssh_config ---- ssh_config 2009-02-21 02:45:02.000000000 +0100 -+++ ssh_config 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/ssh_config 2009-02-21 02:45:02.000000000 +0100 ++++ openssh-5.2p1.new/ssh_config 2009-03-21 15:19:20.000000000 +0100 @@ -26,6 +26,8 @@ # HostbasedAuthentication no # GSSAPIAuthentication no @@ -1161,8 +1161,8 @@ # CheckHostIP yes # AddressFamily any diff -urN openssh-5.2p1/ssh_config.5 openssh-5.2p1.new/ssh_config.5 ---- ssh_config.5 2009-02-23 00:53:58.000000000 +0100 -+++ ssh_config.5 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/ssh_config.5 2009-02-23 00:53:58.000000000 +0100 ++++ openssh-5.2p1.new/ssh_config.5 2009-03-21 15:19:20.000000000 +0100 @@ -478,11 +478,28 @@ The default is .Dq no . @@ -1193,8 +1193,8 @@ Indicates that .Xr ssh 1 diff -urN openssh-5.2p1/sshconnect2.c openssh-5.2p1.new/sshconnect2.c ---- sshconnect2.c 2008-11-05 06:20:47.000000000 +0100 -+++ sshconnect2.c 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/sshconnect2.c 2008-11-05 06:20:47.000000000 +0100 ++++ openssh-5.2p1.new/sshconnect2.c 2009-03-21 15:19:20.000000000 +0100 @@ -104,9 +104,34 @@ { Kex *kex; @@ -1371,8 +1371,8 @@ int diff -urN openssh-5.2p1/sshd.c openssh-5.2p1.new/sshd.c ---- sshd.c 2009-01-28 06:31:23.000000000 +0100 -+++ sshd.c 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/sshd.c 2009-01-28 06:31:23.000000000 +0100 ++++ openssh-5.2p1.new/sshd.c 2009-03-21 15:19:20.000000000 +0100 @@ -119,6 +119,10 @@ #include "monitor_wrap.h" #include "version.h" @@ -1520,8 +1520,8 @@ kex->client_version_string=client_version_string; kex->server_version_string=server_version_string; diff -urN openssh-5.2p1/sshd_config openssh-5.2p1.new/sshd_config ---- sshd_config 2008-07-02 14:35:43.000000000 +0200 -+++ sshd_config 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/sshd_config 2008-07-02 14:35:43.000000000 +0200 ++++ openssh-5.2p1.new/sshd_config 2009-03-21 15:19:20.000000000 +0100 @@ -73,6 +73,8 @@ # GSSAPI options #GSSAPIAuthentication no @@ -1532,8 +1532,8 @@ # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will diff -urN openssh-5.2p1/sshd_config.5 openssh-5.2p1.new/sshd_config.5 ---- sshd_config.5 2009-02-23 01:00:24.000000000 +0100 -+++ sshd_config.5 2009-03-21 15:19:20.000000000 +0100 +--- openssh-5.2p1/sshd_config.5 2009-02-23 01:00:24.000000000 +0100 ++++ openssh-5.2p1.new/sshd_config.5 2009-03-21 15:19:20.000000000 +0100 @@ -374,12 +374,35 @@ The default is .Dq no . @@ -1571,8 +1571,8 @@ Specifies whether rhosts or /etc/hosts.equiv authentication together with successful public key client host authentication is allowed diff -N kexgssc.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ kexgssc.c 4 Apr 2008 12:52:29 -0000 +--- openssh-5.2p1//dev/null 1 Jan 1970 00:00:00 -0000 ++++ openssh-5.2p1.new/kexgssc.c 4 Apr 2008 12:52:29 -0000 @@ -0,0 +1,319 @@ +/* + * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. @@ -1894,8 +1894,8 @@ + +#endif /* GSSAPI */ diff -N kexgsss.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ kexgsss.c 4 Apr 2008 12:52:29 -0000 +--- openssh-5.2p1/kexgsss.c 1 Jan 1970 00:00:00 -0000 ++++ openssh-5.2p1.new/kexgsss.c 4 Apr 2008 12:52:29 -0000 @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 22 19:16:48 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 22 Mar 2009 18:16:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[3863] csw/mgar/pkg/urxvt/trunk Message-ID: Revision: 3863 http://gar.svn.sourceforge.net/gar/?rev=3863&view=rev Author: wahwah Date: 2009-03-22 18:16:48 +0000 (Sun, 22 Mar 2009) Log Message: ----------- CSWurxvt, a patch for Solaris 8, thanks go to hson for help. Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/urxvt/trunk/files/rxvt-unicode-9.06-solaris8.patch Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2009-03-22 16:37:35 UTC (rev 3862) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2009-03-22 18:16:48 UTC (rev 3863) @@ -21,6 +21,7 @@ MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWurxvt,) +PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris8.patch # We define upstream file regex so we can be notifed of new upstream software # release Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2009-03-22 16:37:35 UTC (rev 3862) +++ csw/mgar/pkg/urxvt/trunk/checksums 2009-03-22 18:16:48 UTC (rev 3863) @@ -1,2 +1,3 @@ 4cb9330e99fc0b0b05cebf3581557dd8 download/rxvt-unicode-9.06.tar.bz2 c108ec3aafeb40526dfe1868937f9030 download/CSWurxvt.gspec +cd4459aa4a0b72cb11d9c772eb553863 download/rxvt-unicode-9.06-solaris8.patch Added: csw/mgar/pkg/urxvt/trunk/files/rxvt-unicode-9.06-solaris8.patch =================================================================== --- csw/mgar/pkg/urxvt/trunk/files/rxvt-unicode-9.06-solaris8.patch (rev 0) +++ csw/mgar/pkg/urxvt/trunk/files/rxvt-unicode-9.06-solaris8.patch 2009-03-22 18:16:48 UTC (rev 3863) @@ -0,0 +1,14 @@ +diff -ru rxvt-unicode-9.06.orig/src/rxvttoolkit.C rxvt-unicode-9.06.solaris/src/rxvttoolkit.C +--- rxvt-unicode-9.06.orig/src/rxvttoolkit.C 2008-11-04 10:32:11.000000000 +0100 ++++ rxvt-unicode-9.06.solaris/src/rxvttoolkit.C 2009-03-22 18:47:27.211539180 +0100 +@@ -35,6 +35,10 @@ + # include + #endif + ++#ifdef __sun ++extern "C" char *XSetIMValues(XIM im, ...); ++#endif ++ + const char *const xa_names[] = + { + "TEXT", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 22 23:00:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Mar 2009 22:00:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[3864] csw/mgar/pkg/texinfo/trunk Message-ID: Revision: 3864 http://gar.svn.sourceforge.net/gar/?rev=3864&view=rev Author: dmichelsen Date: 2009-03-22 22:00:30 +0000 (Sun, 22 Mar 2009) Log Message: ----------- texinfo: Add mkdirentries and change dependency to CSWgettextrt Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/texinfo/trunk/checksums Added Paths: ----------- csw/mgar/pkg/texinfo/trunk/files/mkdirentries Removed Paths: ------------- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.gspec Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2009-03-22 18:16:48 UTC (rev 3863) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2009-03-22 22:00:30 UTC (rev 3864) @@ -12,12 +12,12 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz -DISTFILES += $(call admfiles,CSWtexinfo,) +DISTFILES += mkdirentries # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWgsed CSWncurses CSWiconv CSWggettext +REQUIRED_PKGS = CSWgsed CSWncurses CSWiconv CSWggettextrt CONFIGURE_ARGS = $(DIRPATHS) @@ -28,3 +28,8 @@ include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + +post-install-modulated: + ginstall -d $(DESTDIR)$(sbindir) + ginstall -m 755 $(WORKDIR)/mkdirentries $(DESTDIR)$(sbindir)/mkdirentries + @$(MAKECOOKIE) Modified: csw/mgar/pkg/texinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/texinfo/trunk/checksums 2009-03-22 18:16:48 UTC (rev 3863) +++ csw/mgar/pkg/texinfo/trunk/checksums 2009-03-22 22:00:30 UTC (rev 3864) @@ -1,2 +1,2 @@ 71ba711519209b5fb583fed2b3d86fcb download/texinfo-4.13a.tar.gz -a2faefb6b4dbc8b851619b0e467d9685 download/CSWtexinfo.gspec +f5860ae7b0ff06605975c93e2f59fc07 download/mkdirentries Deleted: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.gspec =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.gspec 2009-03-22 18:16:48 UTC (rev 3863) +++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.gspec 2009-03-22 22:00:30 UTC (rev 3864) @@ -1,4 +0,0 @@ -%var bitname texinfo -%var pkgname CSWtexinfo -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/texinfo/trunk/files/mkdirentries =================================================================== --- csw/mgar/pkg/texinfo/trunk/files/mkdirentries (rev 0) +++ csw/mgar/pkg/texinfo/trunk/files/mkdirentries 2009-03-22 22:00:30 UTC (rev 3864) @@ -0,0 +1,8 @@ +#!/bin/sh +BASE=/opt/csw + +FILES=`ls $BASE/share/info | /usr/xpg4/bin/grep -v -e "~" -e "dir"` +for i in $FILES; do + /opt/csw/bin/install-info $BASE/share/info/$i $BASE/share/info/dir 2> /dev/null +done + Property changes on: csw/mgar/pkg/texinfo/trunk/files/mkdirentries ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Mar 22 23:02:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 22 Mar 2009 22:02:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[3865] csw/mgar/pkg/texinfo/trunk/Makefile Message-ID: Revision: 3865 http://gar.svn.sourceforge.net/gar/?rev=3865&view=rev Author: dmichelsen Date: 2009-03-22 22:02:26 +0000 (Sun, 22 Mar 2009) Log Message: ----------- texinfo: Enhance SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2009-03-22 22:00:30 UTC (rev 3864) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2009-03-22 22:02:26 UTC (rev 3865) @@ -14,6 +14,8 @@ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz DISTFILES += mkdirentries +SPKG_SOURCEURL = http://www.gnu.org/software/texinfo/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 23 01:12:34 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Mar 2009 00:12:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[3866] csw/mgar/pkg Message-ID: Revision: 3866 http://gar.svn.sourceforge.net/gar/?rev=3866&view=rev Author: wahwah Date: 2009-03-23 00:12:32 +0000 (Mon, 23 Mar 2009) Log Message: ----------- A sketch of mutt-1.5.19 build. Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mutt/ csw/mgar/pkg/mutt/trunk/ Removed Paths: ------------- csw/mgar/pkg/mutt/trunk/ Property changes on: csw/mgar/pkg/mutt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work gar Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-03-18 22:21:09 UTC (rev 3810) +++ csw/mgar/pkg/mutt/trunk/Makefile 2009-03-23 00:12:32 UTC (rev 3866) @@ -1,24 +1,20 @@ -GARNAME = mypkg -GARVERSION = 1.0 -CATEGORIES = lib +GARNAME = mutt +GARVERSION = 1.5.19 +CATEGORIES = apps -DESCRIPTION = This is a useful library +DESCRIPTION = A text-based mail client for Unix operating systems. define BLURB - It does stuff with things endef -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS_CSWmutt = CSWggettextrt CSWiconv CSWlibidn CSWncurses + CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-03-18 22:21:09 UTC (rev 3810) +++ csw/mgar/pkg/mutt/trunk/checksums 2009-03-23 00:12:32 UTC (rev 3866) @@ -0,0 +1 @@ +73b3747bc7f7c805921e8d24ebac693f download/mutt-1.5.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 23 07:34:14 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Mar 2009 06:34:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[3867] csw/mgar/pkg/template/trunk/ Message-ID: Revision: 3867 http://gar.svn.sourceforge.net/gar/?rev=3867&view=rev Author: wahwah Date: 2009-03-23 06:34:13 +0000 (Mon, 23 Mar 2009) Log Message: ----------- Setting svn:externals in the template to use full SourceForge domain to avoid the problem of non-matching SSL certificate. Property Changed: ---------------- csw/mgar/pkg/template/trunk/ Property changes on: csw/mgar/pkg/template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 23 09:27:13 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 23 Mar 2009 08:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[3868] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 3868 http://gar.svn.sourceforge.net/gar/?rev=3868&view=rev Author: bonivart Date: 2009-03-23 08:27:08 +0000 (Mon, 23 Mar 2009) Log Message: ----------- memconf: update to 2.10 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/memconf/trunk/files/CSWmemconf.gspec Property Changed: ---------------- csw/mgar/pkg/memconf/trunk/ Property changes on: csw/mgar/pkg/memconf/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: gar + https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 06:34:13 UTC (rev 3867) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 08:27:08 UTC (rev 3868) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.9 +GARVERSION = 2.10 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed @@ -11,8 +11,11 @@ MASTER_SITES = http://myweb.cableone.net/4schmidts/unix/ DISTFILES = $(GARNAME).gz DISTFILES += memconf.man -DISTFILES += $(call admfiles,CSWmemconf,) +PACKAGES = CSWmemconf +CATALOGNAME_CSWmemconf = memconf +SPKG_DESC_CSWmemconf = $(DESCRIPTION) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -24,15 +27,15 @@ SPKG_SOURCEURL = http://www.4schmidts.com/memconf.html install-custom: - @echo " ==> Installing $(GARNAME)" + @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)/opt/csw/bin - @ginstall -d $(DESTDIR)/opt/csw/share/doc/memconf + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -d $(DESTDIR)$(mandir)/man1 - @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)/opt/csw/bin/$(GARNAME) - @cp -r $(WORKSRC)/$(GARNAME).man $(DESTDIR)$(mandir)/man1/$(GARNAME).1 - @cp -r $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/LICENSE - @chmod 755 $(DESTDIR)/opt/csw/bin/$(GARNAME) + @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) + @cp $(WORKSRC)/$(GARNAME).man $(DESTDIR)$(mandir)/man1/$(GARNAME).1 + @cp $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license + @chmod 755 $(DESTDIR)$(bindir)/$(GARNAME) @chmod 644 $(DESTDIR)$(mandir)/man1/$(GARNAME).1 - @chmod 444 $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/LICENSE + @chmod 444 $(DESTDIR)$(docdir)/$(GARNAME)/license @$(MAKECOOKIE) Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-03-23 06:34:13 UTC (rev 3867) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-03-23 08:27:08 UTC (rev 3868) @@ -1,3 +1,2 @@ cfdeac4526051778f3ae98490a5a5e85 download/memconf.gz 780d1d77311acf68ff6b76c4ddc75654 download/memconf.man -be48f81212489e2156228774b7516d55 download/CSWmemconf.gspec Deleted: csw/mgar/pkg/memconf/trunk/files/CSWmemconf.gspec =================================================================== --- csw/mgar/pkg/memconf/trunk/files/CSWmemconf.gspec 2009-03-23 06:34:13 UTC (rev 3867) +++ csw/mgar/pkg/memconf/trunk/files/CSWmemconf.gspec 2009-03-23 08:27:08 UTC (rev 3868) @@ -1,8 +0,0 @@ -%var bitname memconf -%var pkgname CSWmemconf -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/memconf/LICENSE for license information. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 23 09:30:12 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 23 Mar 2009 08:30:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[3869] csw/mgar/pkg/memconf/trunk/ Message-ID: Revision: 3869 http://gar.svn.sourceforge.net/gar/?rev=3869&view=rev Author: bonivart Date: 2009-03-23 08:30:12 +0000 (Mon, 23 Mar 2009) Log Message: ----------- memconf: removed prop Property Changed: ---------------- csw/mgar/pkg/memconf/trunk/ Property changes on: csw/mgar/pkg/memconf/trunk ___________________________________________________________________ Deleted: gar - https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 23 09:37:23 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 23 Mar 2009 08:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[3870] csw/mgar/pkg/memconf/trunk/Makefile Message-ID: Revision: 3870 http://gar.svn.sourceforge.net/gar/?rev=3870&view=rev Author: bonivart Date: 2009-03-23 08:37:23 +0000 (Mon, 23 Mar 2009) Log Message: ----------- memconf: added archall Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 08:30:12 UTC (rev 3869) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 08:37:23 UTC (rev 3870) @@ -15,6 +15,7 @@ PACKAGES = CSWmemconf CATALOGNAME_CSWmemconf = memconf SPKG_DESC_CSWmemconf = $(DESCRIPTION) +ARCHALL = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 23 09:50:25 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 23 Mar 2009 08:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[3871] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 3871 http://gar.svn.sourceforge.net/gar/?rev=3871&view=rev Author: bonivart Date: 2009-03-23 08:50:23 +0000 (Mon, 23 Mar 2009) Log Message: ----------- memconf: changed master_site Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 08:37:23 UTC (rev 3870) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 08:50:23 UTC (rev 3871) @@ -8,7 +8,7 @@ a system. It also reports the system type and any empty memory sockets. endef -MASTER_SITES = http://myweb.cableone.net/4schmidts/unix/ +MASTER_SITES = http://www.4schmidts.com/unix/ DISTFILES = $(GARNAME).gz DISTFILES += memconf.man Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-03-23 08:37:23 UTC (rev 3870) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-03-23 08:50:23 UTC (rev 3871) @@ -1,2 +1,2 @@ -cfdeac4526051778f3ae98490a5a5e85 download/memconf.gz -780d1d77311acf68ff6b76c4ddc75654 download/memconf.man +0aee8d982ef9704737a26d6721d9005d download/memconf.gz +d078ef174e55928dca398310c161ae3c download/memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Mar 23 10:11:37 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 23 Mar 2009 09:11:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[3872] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 3872 http://gar.svn.sourceforge.net/gar/?rev=3872&view=rev Author: bonivart Date: 2009-03-23 09:11:37 +0000 (Mon, 23 Mar 2009) Log Message: ----------- memconf: makefile changes Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/memconf/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/memconf/trunk/files/CSWmemconf.copyright Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 08:50:23 UTC (rev 3871) +++ csw/mgar/pkg/memconf/trunk/Makefile 2009-03-23 09:11:37 UTC (rev 3872) @@ -11,10 +11,9 @@ MASTER_SITES = http://www.4schmidts.com/unix/ DISTFILES = $(GARNAME).gz DISTFILES += memconf.man +DISTFILES += COPYING -PACKAGES = CSWmemconf -CATALOGNAME_CSWmemconf = memconf -SPKG_DESC_CSWmemconf = $(DESCRIPTION) +SPKG_DESC = $(DESCRIPTION) ARCHALL = 1 CONFIGURE_SCRIPTS = @@ -31,12 +30,9 @@ @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -d $(DESTDIR)$(mandir)/man1 @cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) @cp $(WORKSRC)/$(GARNAME).man $(DESTDIR)$(mandir)/man1/$(GARNAME).1 - @cp $(FILEDIR)/CSW$(GARNAME).copyright $(DESTDIR)$(docdir)/$(GARNAME)/license @chmod 755 $(DESTDIR)$(bindir)/$(GARNAME) @chmod 644 $(DESTDIR)$(mandir)/man1/$(GARNAME).1 - @chmod 444 $(DESTDIR)$(docdir)/$(GARNAME)/license @$(MAKECOOKIE) Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2009-03-23 08:50:23 UTC (rev 3871) +++ csw/mgar/pkg/memconf/trunk/checksums 2009-03-23 09:11:37 UTC (rev 3872) @@ -1,2 +1,3 @@ 0aee8d982ef9704737a26d6721d9005d download/memconf.gz d078ef174e55928dca398310c161ae3c download/memconf.man +818efbe29da417ad462e3f6345690c3d download/COPYING Added: csw/mgar/pkg/memconf/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/memconf/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/memconf/trunk/files/COPYING 2009-03-23 09:11:37 UTC (rev 3872) @@ -0,0 +1,4 @@ +memconf 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 2 of the License, or (at your option) +any later version. Deleted: csw/mgar/pkg/memconf/trunk/files/CSWmemconf.copyright =================================================================== --- csw/mgar/pkg/memconf/trunk/files/CSWmemconf.copyright 2009-03-23 08:50:23 UTC (rev 3871) +++ csw/mgar/pkg/memconf/trunk/files/CSWmemconf.copyright 2009-03-23 09:11:37 UTC (rev 3872) @@ -1,4 +0,0 @@ -memconf 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 2 of the License, or (at your option) -any later version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Mar 23 11:17:17 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 23 Mar 2009 10:17:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[3873] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 3873 http://gar.svn.sourceforge.net/gar/?rev=3873&view=rev Author: idogan23 Date: 2009-03-23 10:17:17 +0000 (Mon, 23 Mar 2009) Log Message: ----------- apache2: moved to cswinitsmf Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.prototype csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec csw/mgar/pkg/apache2/trunk/files/CSWapache2c.prototype csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.prototype csw/mgar/pkg/apache2/trunk/files/cswapache2 Removed Paths: ------------- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.depend csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.depend csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.depend csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.depend csw/mgar/pkg/apache2/trunk/files/CSWapache2.depend csw/mgar/pkg/apache2/trunk/files/CSWapache2c.depend csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.depend csw/mgar/pkg/apache2/trunk/files/cswapache2.xml csw/mgar/pkg/apache2/trunk/files/svc-cswapache2 Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2009-03-23 09:11:37 UTC (rev 3872) +++ csw/mgar/pkg/apache2/trunk/Makefile 2009-03-23 10:17:17 UTC (rev 3873) @@ -14,25 +14,25 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Dummy toplevel package -DISTFILES += $(call admfiles,CSWapache2,depend prototype) +DISTFILES += $(call admfiles,CSWapache2,prototype) # Runtime -DISTFILES += $(call admfiles,CSWapache2rt,depend prototype checkinstall) +DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall) # Server (core) -CSWapache2c_admfiles = depend prototype postinstall space +CSWapache2c_admfiles = prototype postinstall space DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles)) # Prefork MPM (default) -CSWap2prefork_admfiles = depend prototype postinstall postremove space +CSWap2prefork_admfiles = prototype postinstall postremove space DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles)) # mod_suexec -CSWap2suexec_admfiles = depend prototype postinstall preremove +CSWap2suexec_admfiles = prototype postinstall preremove DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles)) # Manual -DISTFILES += $(call admfiles,CSWapache2-manual,depend prototype) +DISTFILES += $(call admfiles,CSWapache2-manual,prototype) # Development support -DISTFILES += $(call admfiles,CSWapache2-devel,depend prototype) +DISTFILES += $(call admfiles,CSWapache2-devel,prototype) # Standard package bits -DISTFILES += CSWapache2.killproc cswapache2 svc-cswapache2 cswapache2.xml +DISTFILES += CSWapache2.killproc cswapache2 # Configuration templates DISTFILES += httpd.conf.CSW @@ -40,6 +40,22 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 +REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork +REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb44 CSWexpat CSWgdbm CSWiconv +REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib +REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils +REQUIRED_PKGS_CSWapache2rt = CSWbdb44 CSWexpat CSWgdbm CSWggettext CSWgsed +REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl +REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 +REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb44 CSWexpat CSWgdbm +REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl +REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3 +REQUIRED_PKGS_CSWap2suexec = CSWapache2 +REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt +REQUIRED_PKGS_CSWapache2-manual = CSWapache2 + +SPKG_CLASSES_CSWapache2c = none cswinitsmf + pre-configure-modulated: (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \ ./buildconf) @@ -73,8 +89,8 @@ # Copy in specialized templates copy-local-files: - @ginstall -d $(DESTDIR)/etc/init.d - @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/init.d + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d @ginstall $(WORKDIR)/httpd.conf.CSW $(APACHE_ROOT)/etc @ginstall $(WORKDIR)/httpd-mpm.conf.CSW $(APACHE_ROOT)/etc/extra @ginstall $(WORKDIR)/httpd-ssl.conf.CSW $(APACHE_ROOT)/etc/extra Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2009-03-23 09:11:37 UTC (rev 3872) +++ csw/mgar/pkg/apache2/trunk/checksums 2009-03-23 10:17:17 UTC (rev 3873) @@ -1,38 +1,29 @@ 03e0a99a5de0f3f568a0087fb9993af9 download/httpd-2.2.11.tar.gz a7467a756cbd980d4cfe3c2cfb6a9e35 download/config.layout 1b57e8fd32556ee3a3d9fb2a908ddc6c download/CSWapache2.gspec -44ec414654dec572fd43d6a45c001746 download/CSWapache2.depend d41d8cd98f00b204e9800998ecf8427e download/CSWapache2.prototype 7546bc4336d9656e5b02e392264ce114 download/CSWapache2rt.gspec -be2c3e3b32389699b606c1a000032577 download/CSWapache2rt.depend -c05690175946f1b9b6f6dcf2dcf22a91 download/CSWapache2rt.prototype +4f83e81a14f84506f3d0ce1e97b5217e download/CSWapache2rt.prototype 523b1f316a67090dfc08fe7506cb1aa0 download/CSWapache2rt.checkinstall -b466feb59956a06e33fada72d6b69f8d download/CSWapache2c.gspec -a5c969155aec617cdae566c6cef9ffb7 download/CSWapache2c.depend -3285a1402de1315873637ec8a331a50f download/CSWapache2c.prototype +68cf0129905c2aae52cd23e614a05eb6 download/CSWapache2c.gspec +e9af24bf68414f2c1c571e344cc1227a download/CSWapache2c.prototype e629a549294b2d91e8a0365c43d097cd download/CSWapache2c.postinstall 0dd379f20ceb32fc77bb3a9bf045097f download/CSWapache2c.space 03b893953995a59649b9afbc5253f9e1 download/CSWap2prefork.gspec -c0109a5cde3571708a153b17c192a7aa download/CSWap2prefork.depend f02746d1ed7d57d1171fc4c536451fdb download/CSWap2prefork.prototype -ced35f8e68421f6f4db9d0c45b4f8602 download/CSWap2prefork.postinstall +b30329626b94f5e22447c7032c4735b3 download/CSWap2prefork.postinstall 9df2944f619992604f78f477ff5e8c1f download/CSWap2prefork.postremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2prefork.space f90d0488f01ba57bffa88a4c1897ca28 download/CSWap2suexec.gspec -f7a0bada3461bba12b806211802804d0 download/CSWap2suexec.depend 27cc92536c2335868e727f4517a967db download/CSWap2suexec.prototype 405bc4df4662e9faebe34f9b6a093d14 download/CSWap2suexec.postinstall 36128341749fa79f9942f4156b85f5b6 download/CSWap2suexec.preremove cb25d4b9c4e32f9e308c84824a4ca8f3 download/CSWapache2-manual.gspec -f7a0bada3461bba12b806211802804d0 download/CSWapache2-manual.depend -987a8d901c2a82e82b23b03fb6f29960 download/CSWapache2-manual.prototype +b189b99501543416dec017d0ba555f9c download/CSWapache2-manual.prototype 020f593630a0d59a4e398814e0e02c0f download/CSWapache2-devel.gspec -f67ef45b94e60a34fd81f099aa6bf925 download/CSWapache2-devel.depend -86699bad7fbfc5e0af4659435b5d815b download/CSWapache2-devel.prototype +557c1d7fea8d6cd6674be399c0ab10d5 download/CSWapache2-devel.prototype 61b6b11aa70677da9386e90c3b5ba21c download/CSWapache2.killproc -8585969aeaa12e675ee3b7ccf0e460ee download/cswapache2 -6e5506a55603689410486bd335e95886 download/svc-cswapache2 -e07ac241173255cad71139ccc48d7813 download/cswapache2.xml +b3c2086facecc3f898d29f3c8c74da11 download/cswapache2 f0941e5782e4bee45c2c95bd9460796b download/httpd.conf.CSW d9d1abded665674800f3e5c246a4163f download/httpd-mpm.conf.CSW 796a7d5095ce154c274a2ccfd60ec753 download/httpd-ssl.conf.CSW Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.depend =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.depend 2009-03-23 09:11:37 UTC (rev 3872) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.depend 2009-03-23 10:17:17 UTC (rev 3873) @@ -1,12 +0,0 @@ -P CSWapache2c apache2c - Apache 2.2 web server (core) -P CSWapache2rt apache2rt - Apache 2.2 runtime libraries -P CSWbdb44 berkeleydb44 - BerkeleyDB 4.4 libraries and utilities -P CSWexpat expat - XML Parser Toolkit -P CSWgdbm gdbm - GNU dbm -P CSWiconv libiconv - GNU iconv library -P CSWlibnet libnet - the libnet packet construction library -P CSWoldaprt openldap_rt - ldap runtime libraries -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWsasl sasl - Simple Authentication and Security Layer -P CSWzlib zlib - Zlib Data Compression Library -P CSWsqlite3 sqlite3 - An embeddable SQL engine in a C library Modified: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall 2009-03-23 09:11:37 UTC (rev 3872) +++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.postinstall 2009-03-