[cvs] experimental/thesin/finkinfo debhelper.info,1.4,1.5

2013-10-11 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6624

Modified Files:
debhelper.info 
Log Message:
* New upstream release
  * dh: Call dh_installxfonts after dh_link, so that it will
notice fonts installed via symlinks. Closes: #721264
  * Fix FTBFS with perl 5.18. Closes: #722501
  * dh_installchangelogs: Add changelog.md to the list of common
changelog filenames.



Index: debhelper.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debhelper.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- debhelper.info  21 Sep 2013 01:04:47 -  1.4
+++ debhelper.info  11 Oct 2013 15:40:17 -  1.5
@@ -1,5 +1,5 @@
 Package: debhelper
-Version: 9.20130720
+Version: 9.20130921
 Revision: 1
 ###
 ## po4a
@@ -12,7 +12,7 @@
 Suggests: dh-make
 ###
 Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 7ca139c0b53d604c41e423fea4fecda4
+Source-MD5: ffad83a8dcc770555994832a62cdf8f7
 SourceDirectory: %n
 ###
 PatchScript: 


--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register 
http://pubads.g.doubleclick.net/gampad/clk?id=60134071iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo mysql-server-5.5.info, 1.13, 1.14 mysql-server-5.5.patch, 1.9, 1.10

2013-10-11 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13187

Modified Files:
mysql-server-5.5.info mysql-server-5.5.patch 
Log Message:
* New upstream release
  * d/rules, d/control: Remove gcc-4.4 dependency and disable X86
assembly in taocrypt. (Closes: #707280) (Closes: #678252)
  * d/patches/fix-mips64el-ftbfs.patch: Fix FTBFS on mips64el.
(Closes: #719196) Thanks YunQuiang Su.
  * New upstream release.
SECURITY UPDATE: CVE-2013-1861 CVE-2013-3783 CVE-2013-3793
CVE-2013-3804 CVE-2013-3802 CVE-2013-3809 CVE-2013-3812
(Closes: #706715) (Closes: #712730)
  * d/patches/work_around_failing_rpl_deadlock.patch: Test suite
changes upstream have left some connections active. This
patch fixes that. Thanks Kristian Nielsen!
  * d/patches/fix-racey-rpltests.patch: Fix from Oracle for failing
tests.



Index: mysql-server-5.5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mysql-server-5.5.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mysql-server-5.5.info   14 May 2013 16:06:54 -  1.13
+++ mysql-server-5.5.info   11 Oct 2013 16:58:57 -  1.14
@@ -1,5 +1,5 @@
 Package: mysql-server-5.5
-Version: 5.5.31
+Version: 5.5.33
 Revision: 1.1
 ###
 BuildDepends: fink (= 0.34.99.git), dpkg (= 1.15), libncurses5 (= 5.0-6), 
readline6, po-debconf, cmake
@@ -11,10 +11,10 @@
 ###
 Source: mirror:debian:/pool/main/m/mysql-5.5/mysql-5.5_%v+dfsg.orig.tar.gz
 SourceDirectory: mysql-5.5-%v+dfsg.orig
-Source-MD5: fa8d422a9cd6948dee7a9a7245c36b2f
+Source-MD5: f35902e01453dd7eedb2a647c69b39ec
 ###
 PatchFile: %n.patch
-PatchFile-MD5: ec23f34df08d801cc30a3e36aedc4a68
+PatchFile-MD5: 36083bdf3fd769c4eb5322e541c48850
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -29,6 +29,8 @@
   patch -p1  fink/patches/94_spelling.patch
   patch -p1  fink/patches/regex_plus.patch
   patch -p1  fink/patches/versioned_symbols.patch
+  patch -p1  fink/patches/fix-mips64el-ftbfs.patch
+  patch -p1  fink/patches/fix-racey-rpltests.patch
 
   # Fix for darwin/fink
   patch -p1  fink/patches/cmake_readline_fix.patch
@@ -66,8 +68,8 @@
 ###
 DocFiles: COPYING INSTALL-SOURCE README VERSION
 ###
-SetCFLAGS: -arch x86_64 -m64 -O2 -DBIG_JOINS=1 -fno-strict-aliasing 
-Wno-gnu-designator -Wno-deprecated
-SetCXXFLAGS: -arch x86_64 -m64 -O3 -DBIG_JOINS=1 -felide-constructors 
-fno-exceptions -fno-rtti -fno-strict-aliasing -Wno-gnu-designator 
-Wno-deprecated
+SetCFLAGS: -arch x86_64 -m64 -O2 -DBIG_JOINS=1 -fno-strict-aliasing 
-DTAOCRYPT_DISABLE_X86ASM -Wno-gnu-designator -Wno-deprecated
+SetCXXFLAGS: -arch x86_64 -m64 -O3 -DBIG_JOINS=1 -felide-constructors 
-fno-exceptions -fno-rtti -fno-strict-aliasing -DTAOCRYPT_DISABLE_X86ASM 
-Wno-gnu-designator -Wno-deprecated
 SetLDFLAGS: -arch x86_64 -m64
 ###
 CompileScript: 

Index: mysql-server-5.5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mysql-server-5.5.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mysql-server-5.5.patch  14 May 2013 16:06:54 -  1.9
+++ mysql-server-5.5.patch  11 Oct 2013 16:58:57 -  1.10
@@ -1,6 +1,6 @@
-diff -ruN 
mysql-5.5-5.5.31+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in 
mysql-5.5-5.5.31+dfsg.orig/fink/additions/Docs__Images__Makefile.in
 mysql-5.5-5.5.31+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in   
1969-12-31 17:00:00.0 -0700
-+++ mysql-5.5-5.5.31+dfsg.orig/fink/additions/Docs__Images__Makefile.in
2012-07-12 15:48:13.0 -0600
+diff -ruN 
mysql-5.5-5.5.33+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in 
mysql-5.5-5.5.33+dfsg.orig/fink/additions/Docs__Images__Makefile.in
+--- mysql-5.5-5.5.33+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in   
1969-12-31 17:00:00.0 -0700
 mysql-5.5-5.5.33+dfsg.orig/fink/additions/Docs__Images__Makefile.in
2012-07-12 15:48:13.0 -0600
 @@ -0,0 +1,6 @@
 +all:
 +
@@ -8,9 +8,9 @@
 +  -rm -f Makefile
[...1239 lines suppressed...]
-+++ mysql-5.5-5.5.31+dfsg.orig/fink/po/templates.pot   2012-07-17 
08:17:32.0 -0600
+diff -ruN mysql-5.5-5.5.33+dfsg.orig.orig/fink/po/templates.pot 
mysql-5.5-5.5.33+dfsg.orig/fink/po/templates.pot
+--- mysql-5.5-5.5.33+dfsg.orig.orig/fink/po/templates.pot  1969-12-31 
17:00:00.0 -0700
 mysql-5.5-5.5.33+dfsg.orig/fink/po/templates.pot   2012-07-17 
08:17:32.0 -0600
 @@ -0,0 +1,187 @@
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -22352,9 +22629,9 @@
 +mysql-cluster-server package and remove all lines starting with \ndb\ from 

 +all config files below /etc/mysql/.
 +msgstr 
-diff -ruN mysql-5.5-5.5.31+dfsg.orig.orig/fink/po/tr.po 

[cvs] experimental/thesin/finkinfo php5.info, 1.21, 1.22 php5.patch, 1.16, 1.17

2013-10-11 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26983

Modified Files:
php5.info php5.patch 
Log Message:
* New Upstream Release
  * In maintscripts not emit 'no action required' messages to
console (closes: #724001).
  * Remove obsolete patches: 004-ldap_fix, 036-fd_setsize_fix,
043-recode_size_t, 045-exif_nesting_level, 047-zts_with_dl and 
108-64_bit_datetime.
  * Add patch info (description, author and bug number)
  * Delete patches we don't apply during build
  * Add a reference to GNU/Hurd porting guidelines
  * New upstream version 5.5.4+dfsg
  * Remove SHA2 broken test patch; merged upstream
  * Refresh patches for 5.5.4 release
* Move patching to use debian dir instead of duplicating all patches



Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- php5.info   20 Sep 2013 22:48:30 -  1.21
+++ php5.info   11 Oct 2013 19:50:45 -  1.22
@@ -1,6 +1,6 @@
 Info2: 
 Package: php5
-Version: 5.5.3
+Version: 5.5.4
 Revision: 1.1
 Type: sapiver (20121212), embedver (5)
 ###
@@ -119,74 +119,67 @@
 
 ###
 Source: mirror:custom:distributions/php-%v.tar.gz
-Source-MD5: a5dfdd41ccf539942db966310f7429da
+Source-MD5: bf842770ac64a47ff599f463e6cf1334
 Source2: mirror:debian:/pool/main/p/php5/php5_%v+dfsg-1.debian.tar.gz
-Source2-MD5: 6988c4ad9f9ddb37c7f04c91542cbc7b
+Source2-MD5: f19ab743f1f7d98fe0ffda2afba822f9
 Source2ExtractDir: php-%v
 PatchFile: %n.patch
-PatchFile-MD5: 0db6ab20012e4a9542c6cdd521a00bb8
+PatchFile-MD5: a8e912944940774a04dc44c6d43fcd93
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
   ### Apply some Debian Patches for Security and Build Issues
-  patch -p1  fink/patches/001-libtool_fixes.patch
-  patch -p1  fink/patches/002-static_openssl.patch
-  patch -p1  fink/patches/004-ldap_fix.patch
+  patch -p1  debian/patches/001-libtool_fixes.patch
+  patch -p1  debian/patches/002-static_openssl.patch
 ### Use fink_quirks.patch instead
-#  patch -p1  fink/patches/006-debian_quirks.patch
+#  patch -p1  debian/patches/006-debian_quirks.patch
   patch -p1  fink/patches/fink_quirks.patch
-  patch -p1  fink/patches/libtool2.2.patch
-  patch -p1  fink/patches/033-we_WANT_libtool.patch
-  patch -p1  fink/patches/036-fd_setsize_fix.patch
-  patch -p1  fink/patches/043-recode_size_t.patch
-  patch -p1  fink/patches/044-strtod_arm_fix.patch
-  patch -p1  fink/patches/045-exif_nesting_level.patch
-  patch -p1  fink/patches/047-zts_with_dl.patch
-  patch -p1  fink/patches/052-phpinfo_no_configure.patch
-  patch -p1  fink/patches/053-extension_api.patch
-  patch -p1  fink/patches/057-no_apache_installed.patch
-  patch -p1  fink/patches/100-recode_is_shared.patch
-  patch -p1  fink/patches/108-64_bit_datetime.patch
-  patch -p1  fink/patches/112-proc_open.patch
-  patch -p1  fink/patches/113-php.ini_securitynotes.patch
-  patch -p1  fink/patches/116-posixness_fix.patch
-  patch -p1  fink/patches/libdb_is_-ldb
-  patch -p1  fink/patches/fix_broken_upstream_tests.patch
-  patch -p1  fink/patches/use_embedded_timezonedb.patch
-  patch -p1  fink/patches/force_libmysqlclient_r.patch
-  patch -p1  fink/patches/mssql-null-exception.patch
-  patch -p1  fink/patches/sybase-alias.patch
-  patch -p1  fink/patches/strcmp_null-OnUpdateErrorLog.patch
-#  patch -p1  fink/patches/deprecate_short_open_tag
-  patch -p1  fink/patches/fix_broken_5.3_tests.patch
-  patch -p1  fink/patches/dont-gitclean-in-build.patch
-#  patch -p1  fink/patches/broken_5.3_test-posix_uname.patch
-  patch -p1  fink/patches/shtool_mkdir_-p_-race-condition.patch
-  patch -p1  fink/patches/qdbm-is-usr_include_qdbm.patch
-  patch -p1  fink/patches/use_embedded_timezonedb_fixes.patch
-  patch -p1  fink/patches/fix_broken_sha2_test.patch
+  patch -p1  debian/patches/libtool2.2.patch
+  patch -p1  debian/patches/033-we_WANT_libtool.patch
+  patch -p1  debian/patches/044-strtod_arm_fix.patch
+  patch -p1  debian/patches/052-phpinfo_no_configure.patch
+  patch -p1  debian/patches/053-extension_api.patch
+  patch -p1  debian/patches/057-no_apache_installed.patch
+  patch -p1  debian/patches/100-recode_is_shared.patch
+  patch -p1  debian/patches/112-proc_open.patch
+  patch -p1  debian/patches/113-php.ini_securitynotes.patch
+  patch -p1  debian/patches/116-posixness_fix.patch
+  patch -p1  debian/patches/libdb_is_-ldb
+  patch -p1  debian/patches/fix_broken_upstream_tests.patch
+  patch -p1  debian/patches/use_embedded_timezonedb.patch
+  patch -p1  debian/patches/force_libmysqlclient_r.patch
+  patch -p1  debian/patches/mssql-null-exception.patch
+  patch -p1  debian/patches/sybase-alias.patch
+  patch -p1  debian/patches/strcmp_null-OnUpdateErrorLog.patch
+#  patch -p1  debian/patches/deprecate_short_open_tag
+  patch -p1  

[cvs] experimental/thesin/finkinfo texinfo.info,1.15,1.16

2013-10-06 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22750

Modified Files:
texinfo.info 
Log Message:
Change Dep fields to tabs, add missing RuntimeDepends on text-unidecode-pm

Index: texinfo.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- texinfo.info13 Jun 2013 15:14:28 -  1.15
+++ texinfo.info6 Oct 2013 15:59:21 -   1.16
@@ -5,17 +5,20 @@
 Source-MD5: 54e250014fe698fb4832016158747c03
 SourceDirectory: %n-%v
 BuildDepends: 
-  fink (= 0.34.99.git),
-  libiconv-dev,
-  libncurses5 (= 5.4-20041023-1006),
-  libgettext8-dev,
-  gettext-tools
+   fink (= 0.34.99.git),
+   libiconv-dev,
+   libncurses5 (= 5.4-20041023-1006),
+   libgettext8-dev,
+   gettext-tools
 
 Depends: 
-  ncurses (= 5.4-20041023-1006),
-  libncurses5-shlibs (= 5.4-20041023-1006),
-  libgettext8-shlibs,
-  libiconv
+   ncurses (= 5.4-20041023-1006),
+   libncurses5-shlibs (= 5.4-20041023-1006),
+   libgettext8-shlibs,
+   libiconv
+
+RuntimeDepends: 
+   text-unidecode-pm
 
 Replaces: tetex-base ( 3.0-1)
 PatchFile: %n.patch


--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register 
http://pubads.g.doubleclick.net/gampad/clk?id=60134791iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/libs libnewt0-shlibs.info, 1.2, 1.3

2013-09-20 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6925

Modified Files:
libnewt0-shlibs.info 
Log Message:
  * Fix handling of alternatives for %p/etc/newt/palette in M-A package
libnewt0.52. CLoses: #718635


Index: libnewt0-shlibs.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libnewt0-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libnewt0-shlibs.info17 Jun 2013 19:48:42 -  1.2
+++ libnewt0-shlibs.info20 Sep 2013 14:48:24 -  1.3
@@ -1,6 +1,6 @@
 Package: libnewt0-shlibs
 Version: 0.52.15
-Revision: 2.1
+Revision: 3.1
 ###
 Source: mirror:debian:pool/main/n/newt/newt_%v.orig.tar.gz
 Source-MD5: 343ee3a0fd0eacdb7c508a1e1cfabf65
@@ -97,9 +97,19 @@
 set -e
 
 case $1 in
-configure)
-   # Install alternatives
-   update-alternatives --install %p/etc/newt/palette newt-palette 
%p/etc/newt/palette.original 20
+configure|abort-remove|abort-deconfigure)
+# Install alternatives
+update-alternatives --install %p/etc/newt/palette newt-palette 
%p/etc/newt/palette.original 20
+[ -e %p/share/doc/libnewt0-shlibs ] || update-alternatives --auto 
newt-palette
+;;
+abort-upgrade)
+# Nothing to undo
+:;
+;;
+
+*)
+echo $0: Undocumented call: \$@\ 2
+exit 1
 ;;
 esac
 


--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info, 1.20, 1.21 php5.patch, 1.15, 1.16

2013-09-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31128

Modified Files:
php5.info php5.patch 
Log Message:
  * Remove builtin json
  * fix dh scripts


Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- php5.info   9 Sep 2013 22:35:16 -   1.20
+++ php5.info   20 Sep 2013 22:48:30 -  1.21
@@ -124,7 +124,7 @@
 Source2-MD5: 6988c4ad9f9ddb37c7f04c91542cbc7b
 Source2ExtractDir: php-%v
 PatchFile: %n.patch
-PatchFile-MD5: e9b283912e327d58b51851884b1318c4
+PatchFile-MD5: 0db6ab20012e4a9542c6cdd521a00bb8
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -196,6 +196,12 @@
   cp fink/*.conf debian/
   cp fink/*.load debian/
   cp fink/*.ini debian/
+
+  ## Patch user out of autoscripts
+  perl -pi -e 's,\/usr,%p,g' debian/debhelper/*-php5
+
+  ## No builtin json (dfsg)
+  rm -rf ext/json/*
 
 ###
 ConfigureParams: 
@@ -721,8 +727,8 @@
 install -m755 fink/debhelper/dh_* debian/php5-dev%p/bin
 install -d -m755 debian/php5-dev%p/share/debhelper/autoscripts/
 install -m644 debian/debhelper/*-php5 
debian/php5-dev%p/share/debhelper/autoscripts/
-install -d -m755 debian/php5-dev%p/share/perl5/Debian/Debhelper/Sequence
-install -m644 fink/debhelper/php5.pm 
debian/php5-dev%p/share/perl5/Debian/Debhelper/Sequence
+install -d -m755 debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
+install -m644 fink/debhelper/php5.pm 
debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
 
 # install common files
 install -d -m755 debian/php5-common%p/lib/php5
@@ -911,11 +917,14 @@
 ###
 SplitOff: 
   Package: %N-dev
+  Provides: dh-php5
   BuildDependsOnly: true
   Depends: 
+   libtool2,
%N-common (= %v-%r),
lib%N-embed%type_raw[embedver] (= %v-%r)
   
+  Recommends: pkg-php-tools
   DescUsage: 
 To use phpize you will need libtool2, since it is a BOD package you need to
 add that BuildDepends in all php5-modules that use phpize to build.
@@ -965,8 +974,8 @@
 SplitOff2: 
   Package: lib%N-embed%type_raw[embedver]
   Provides: phpapi-%type_raw[sapiver]
-  Replaces: lib%N-embed ( 5.5.1)
-  Conflicts: lib%N-embed ( 5.5.1)
+  Replaces: lib%N-embed, lib%N-embed4
+  Conflicts: lib%N-embed, lib%N-embed4
   Depends: 
ucf,
%N-common (= %v-%r),
@@ -1910,6 +1919,10 @@
cron-service,
coreutils
   
+  Provides: php5-mhash
+  Conflicts: php5-mhash
+  Recommends: php5-json
+  Suggests: php5-user-cache
   Docfiles: CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS README* 
test-results.txt
   InstallScript: 
 cp -a debian/%n%p/* %i/

Index: php5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- php5.patch  9 Sep 2013 22:35:16 -   1.15
+++ php5.patch  20 Sep 2013 22:48:30 -  1.16
@@ -852,9 +852,9 @@
 +fi
 diff -ruN php-5.5.3.orig/fink/libphp5-embed.postrm.extra 
php-5.5.3/fink/libphp5-embed.postrm.extra
 --- php-5.5.3.orig/fink/libphp5-embed.postrm.extra 1969-12-31 
17:00:00.0 -0700
-+++ php-5.5.3/fink/libphp5-embed.postrm.extra  2013-07-22 00:25:25.0 
-0600
 php-5.5.3/fink/libphp5-embed.postrm.extra  2013-09-09 20:31:13.0 
-0600
 @@ -0,0 +1 @@
-+[ $1 = remove ]  ldconfig
++#[ $1 = remove ]  ldconfig
 diff -ruN php-5.5.3.orig/fink/maxlifetime php-5.5.3/fink/maxlifetime
 --- php-5.5.3.orig/fink/maxlifetime1969-12-31 17:00:00.0 -0700
 +++ php-5.5.3/fink/maxlifetime 2013-08-08 09:39:51.0 -0600


--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debhelper.info,1.2,1.3

2013-09-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31154

Modified Files:
debhelper.info 
Log Message:
  * /usr - %p fixes
  * fix perms so that build as no one or build as root works in fink


Index: debhelper.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debhelper.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debhelper.info  3 Sep 2013 20:20:16 -   1.2
+++ debhelper.info  20 Sep 2013 22:49:17 -  1.3
@@ -71,6 +71,15 @@
 mv debian/Debhelper perl/Debian
 perl -pi -e 's,Debian\/,perl\/Debian\/,g' Makefile t/syntax
 perl -pi -e 's,PERL5LIB=..\/..,PERL5LIB=..\/..\/perl,g' t/override_target
+
+perl -pi -e 's,-0r,,g' dh_fixperms
+perl -pi -e 's,--no-dereference 0:0, . getpwuid\(\$\) . :,g' dh_fixperms
+perl -pi -e 's,0:0,getpwuid\(\$\):,g' dh_install*
+perl -pi -e 's;-o,0;-o,\$\;g' dh_install*
+perl -pi -e 's;-g,0;-g,\(split  , \$\( \)\[0\];g' dh_install*
+
+# Fixes so we don't need to be root, root or fink-bld is acceptable
+perl -pi -e 's,\$\ != 0,\$\ != 0 and getpwuid\(\$\) ne fink-bld,g' 
dh_testroot
 
 ###
 CompileScript: 


--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo pkg-php-tools.info,NONE,1.1

2013-09-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31227

Added Files:
pkg-php-tools.info 
Log Message:
New Port

--- NEW FILE: pkg-php-tools.info ---
Package: pkg-php-tools
Version: 1.8
Revision: 1
###
BuildDepends: 
debhelper (= 7.0.50),
php5-cli,
php-pear

Depends: 
debhelper,
php-pear,
php5-cli,
coreutils

Suggests: 
dh-make

###
Source: mirror:debian:pool/main/p/%n/%n_%v.tar.gz
Source-MD5: d8b8a4701d72bb1365da6c32bb5b5234
SourceDirectory: %n-%v
###
PatchScript:
perl -pi -e 's,\/usr,%p,g' bin/dh_* 
lib/perl/Debian/Debhelper/Buildsystem/phppear.pm lib/scripts/phppkginfo 
doc/pkg-php-tools.pod testsuite/tests/101_dh_phppear_substvars.sh 
testsuite/tests/151_dh_phpcomposer_substvars.sh
perl -pi -e 's,\/usr\/share,%p\/share,g' 
testsuite/tests/201_Debian_Debhelper_Buildsystem_phppear.pl
perl -pi -e 's,\%p\/bin\/install,\/usr\/bin\/install,g' 
lib/perl/Debian/Debhelper/Buildsystem/phppear.pm
perl -pi -e 's,\%p\/bin\/perl,\/usr\/bin\/perl,g' bin/dh_*
perl -pi -e 's,\rmdir\,\grmdir\,g' 
lib/perl/Debian/Debhelper/Buildsystem/phppear.pm

###
CompileScript: 
make

InfoTest: 
# It requires it's self to be installed but tests can be run
TestScript: 
#!/bin/bash -ev
if [ $(fink list pkg-php-tools | tail -n 1 | cut -f1 -f3) !=  i  %v-%r 
]; then
echo %N needs to be built and installed before tests can be run!;
exit 0;
fi

make test || exit 2


InstallScript: 
install -d -m 0755 %i/share/pkg-php-tools/scripts
install -m 0755 lib/scripts/phppkginfo %i/share/pkg-php-tools/scripts
cp -R lib/overrides %i/share/pkg-php-tools/
install -d -m 0755 %i/lib/perl5
cp -R lib/perl/* %i/lib/perl5
install -d -m 0755 %i/bin
install -m 0755 bin/* %i/bin

install -d -m 0755 %i/share/man/man1
install -m 0644 *.1 %i/share/man/man1
install -d -m 0755 %i/share/man/man7
install -m 0644 *.7 %i/share/man/man7

###
DocFiles: debian/changelog debian/copyright debian/README*
###
Description: Various packaging tools for PHP packages
DescDetail: 
Provide an easy way to package PHP PEAR, PECL and Composer packages: Run
dh_make, edit debian/rules and debian/control and that's it!
.
Detailed instructions can be found in included READMEs.

###
License: GPL
Maintainer: Justin F. Halett the...@lists.sourceforge.net
Homepage: http://packages.debian.org/unstable/admin/pkg-php-tools.html


--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debhelper.info,1.3,1.4

2013-09-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3436

Modified Files:
debhelper.info 
Log Message:
  * fixes for dh_installdeb


Index: debhelper.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debhelper.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debhelper.info  20 Sep 2013 22:49:17 -  1.3
+++ debhelper.info  21 Sep 2013 01:04:47 -  1.4
@@ -72,11 +72,15 @@
 perl -pi -e 's,Debian\/,perl\/Debian\/,g' Makefile t/syntax
 perl -pi -e 's,PERL5LIB=..\/..,PERL5LIB=..\/..\/perl,g' t/override_target
 
+perl -pi -e 's,-printf (.)\%p\/etc\/.P...,\| sed -e \1s;\$tmp;;g\1,g' 
dh_installdeb
+
 perl -pi -e 's,-0r,,g' dh_fixperms
 perl -pi -e 's,--no-dereference 0:0, . getpwuid\(\$\) . :,g' dh_fixperms
-perl -pi -e 's,0:0,getpwuid\(\$\):,g' dh_install*
-perl -pi -e 's;-o,0;-o,\$\;g' dh_install*
-perl -pi -e 's;-g,0;-g,\(split  , \$\( \)\[0\];g' dh_install*
+perl -pi -e 's,\0:0\,getpwuid\(\$\) \. \:\,g' dh_* 
perl/Debian/Debhelper/Dh_Lib.pm
+perl -pi -e 's;-o,0;-o,\$\;g' dh_*
+perl -pi -e 's;-g,0;-g,\(split  , \$\( \)\[0\];g' dh_*
+perl -pi -e 's;-o, 0;-o, \$\;g' dh_*
+perl -pi -e 's;-g, 0;-g, \(split  , \$\( \)\[0\];g' dh_*
 
 # Fixes so we don't need to be root, root or fink-bld is acceptable
 perl -pi -e 's,\$\ != 0,\$\ != 0 and getpwuid\(\$\) ne fink-bld,g' 
dh_testroot


--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=64545871iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5-json.info,NONE,1.1

2013-09-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3487

Added Files:
php5-json.info 
Log Message:
New port, first fink using debhelper build\!

--- NEW FILE: php5-json.info ---
Package: php5-json
Version: 1.3.2
Revision: 1.1
###
BuildDepends: 
debhelper (= 9),
php5-dev (= 5.5.0-1),
php5-cli (= 5.5.0-1),
dh-php5,
pkg-php-tools,
pkgconfig,
libjson-c (= 0.11-3)

Depends: 
phpapi-20121212,
libjson-c2-shlibs,
ucf

Replaces: 
php5-dev ( 5.5.0-1)

###
Source: http://pecl.php.net/get/jsonc-%v.tgz
Source-MD5: 8e1e30a996b1f3e5e370f6bb54eb40b7
Source2: mirror:debian:pool/main/p/php-json/php-json_%v-1.debian.tar.gz
Source2-MD5: 3b7867f6b3826b4669c4448b5c012654
Source2ExtractDir: .
###
PatchScript: 
BASE=$(echo %p | perl -pi -e 's,/,,'); \
perl -pi -e s,usr,${BASE},g ../debian/%n.install ../debian/%n.dirs

CompileScript: 
cd ..  dh build --buildsystem=phppear --with phppear --with php5

InstallScript: 
cd ..  dh install --buildsystem=phppear --with phppear --with php5
cd ..  dh_strip
cd ..  dh_installdeb

cp -R ../debian/%N%p/* %i/
cp ../debian/%N/DEBIAN/post* %d/DEBIAN/
cp ../debian/%N/DEBIAN/pre* %d/DEBIAN/

###
ConfFiles: %p/etc/php5/mods-available/json.ini
DocFiles: CREDITS INSTALL README* LICENSE ../package.xml
###
###
Description: JSON module for php5
DescDetail: 
This package provides a module for JSON functions in PHP scripts.
.
PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
open source general-purpose scripting language that is especially suited
for web development and can be embedded into HTML.

###
License: GPL
Maintainer: Justin F. Halett the...@lists.sourceforge.net
Homepage: http://pecl.php.net/package/jsonc


--
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=64545871iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info, 1.49, 1.50 dpkg.patch, 1.20, 1.21

2013-09-10 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31438

Modified Files:
dpkg.info dpkg.patch 
Log Message:
  * Add Recommends on anacron
  * Add cron.daily script to backup the dpkg status file
  * Add depend on debianutils (dpkg)
  * Add depend on sensible-utils (libdpkg-pm)


Index: dpkg.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- dpkg.patch  23 Jun 2013 14:17:33 -  1.20
+++ dpkg.patch  10 Sep 2013 15:21:16 -  1.21
@@ -32,6 +32,20 @@
 +# fink defaults
 +PREPEND CPPFLAGS -I@FINKPREFIX@/include
 +PREPEND LDFLAGS -L@FINKPREFIX@/lib
+diff -ruN dpkg-1.16.10.orig/fink/dpkg.cron.daily 
dpkg-1.16.10/fink/dpkg.cron.daily
+--- dpkg-1.16.10.orig/fink/dpkg.cron.daily 1969-12-31 17:00:00.0 
-0700
 dpkg-1.16.10/fink/dpkg.cron.daily  2013-09-10 09:13:20.0 -0600
+@@ -0,0 +1,10 @@
++#!/bin/sh
++
++# Backup the 7 last versions of dpkg's status file
++if cd @FINKPREFIX@/var/backups ; then
++if ! cmp -s dpkg.status.0 @FINKPREIFX@/var/lib/dpkg/status ; then
++cp -p @FINKPREFIX@/var/lib/dpkg/status dpkg.status
++savelog -c 7 dpkg.status /dev/null
++fi
++fi
++
 diff -ruN dpkg-1.16.10.orig/fink/md5sum dpkg-1.16.10/fink/md5sum
 --- dpkg-1.16.10.orig/fink/md5sum  1969-12-31 17:00:00.0 -0700
 +++ dpkg-1.16.10/fink/md5sum   2013-05-28 08:30:00.0 -0600

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- dpkg.info   3 Sep 2013 04:24:51 -   1.49
+++ dpkg.info   10 Sep 2013 15:21:16 -  1.50
@@ -17,10 +17,12 @@
   libgettext8-shlibs,
   liblzma5-shlibs,
   tar,
-  install-info
+  install-info,
+  debianutils
 
 Conflicts: dpkg-bootstrap
 Replaces: dpkg-bootstrap
+Recommends: anacron
 Suggests: apt
 Essential: yes
 Maintainer: Fink Core Group fink-c...@lists.sourceforge.net
@@ -30,7 +32,7 @@
 Source-MD5: a20a06a5272717274a8b009368f237da
 
 PatchFile: dpkg.patch
-PatchFile-MD5: a851cfe5976cffc3efe6c044d1c88578
+PatchFile-MD5: 955e0a002c785067af074e312da4747f
 
 PatchScript: 
 sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -142,6 +144,10 @@
 
   install -m 0755 fink/md5sum %i/bin
 
+  install -d -m 0755 %i/etc/cron.daily
+  install -d -m 0755 %i/var/backups
+  install -m 0644 fink/dpkg.cron.daily %i/etc/cron.daily/dpkg
+
   # install fink as a vendor
   install -m 0644 scripts/Dpkg/Vendor/Fink.pm %i/lib/perl5/Dpkg/Vendor/Fink.pm
 
@@ -151,7 +157,9 @@
   ln -s %p/bin/dpkg-statoverride %i/sbin/dpkg-statoverride
   ln -s %p/bin/update-alternatives %i/sbin/update-alternatives
 
-ConfFiles: %p/etc/dpkg/origins/fink
+ConfFiles: 
+  %p/etc/dpkg/origins/fink
+
 DocFiles: 
   ABOUT-NLS AUTHORS COPYING ChangeLog NEWS
   README README.translators THANKS TODO
@@ -751,7 +759,8 @@
   Package: lib%N-pm
   Depends: 
 %N (= 1.15.8),
-time-date-pm
+time-date-pm,
+sensible-utils
   
   Recommends: 
 bzip2,


--
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=5127iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.50,1.51

2013-09-10 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5205

Modified Files:
dpkg.info 
Log Message:
Add comments for new depends for future reference

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- dpkg.info   10 Sep 2013 15:21:16 -  1.50
+++ dpkg.info   10 Sep 2013 17:43:05 -  1.51
@@ -12,6 +12,7 @@
   libncursesw5,
   bzip2-dev
 
+## debianutils is a runtime dep for the cron job with calls savelog
 Depends: 
   bzip2-shlibs,
   libgettext8-shlibs,
@@ -757,6 +758,7 @@
 
 SplitOff3: 
   Package: lib%N-pm
+  # sensible-utils is a runtime dep for V2.pm
   Depends: 
 %N (= 1.15.8),
 time-date-pm,


--
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=5127iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.51,1.52

2013-09-10 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5713

Modified Files:
dpkg.info 
Log Message:
Move runtimedepends to proper field, update testdepends for this change

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- dpkg.info   10 Sep 2013 17:43:05 -  1.51
+++ dpkg.info   10 Sep 2013 17:56:19 -  1.52
@@ -12,11 +12,13 @@
   libncursesw5,
   bzip2-dev
 
-## debianutils is a runtime dep for the cron job with calls savelog
 Depends: 
   bzip2-shlibs,
   libgettext8-shlibs,
-  liblzma5-shlibs,
+  liblzma5-shlibs
+
+## debianutils is a runtime dep for the cron job with calls savelog
+RuntimeDepends: 
   tar,
   install-info,
   debianutils
@@ -124,9 +126,18 @@
 
 
 InfoTest: 
-  TestConfigureParams: --disable-silent-rules
-  TestDepends: io-string-pm, time-date-pm
-  TestScript: make check || exit 2
+  TestConfigureParams: 
+--disable-silent-rules
+  
+  TestDepends: 
+io-string-pm,
+time-date-pm,
+objtools,
+sensible-utils
+  
+  TestScript: 
+make check || exit 2
+  
 
 
 InstallScript: 
@@ -688,10 +699,12 @@
   Package: %N-dev
   Depends: 
 lib%N-pm (= %v-%r),
+base-files (= 1.9.12-1)
+  
+  RuntimeDepends: 
 objtools,
 bzip2,
-xz,
-base-files (= 1.9.12-1)
+xz
   
   Recommends: 
 patch,
@@ -758,9 +771,11 @@
 
 SplitOff3: 
   Package: lib%N-pm
-  # sensible-utils is a runtime dep for V2.pm
   Depends: 
-%N (= 1.15.8),
+%N (= 1.15.8)
+  
+  # sensible-utils is a runtime dep for V2.pm
+  RuntimeDepends: 
 time-date-pm,
 sensible-utils
   
@@ -822,10 +837,12 @@
 SplitOff4: 
   Package: dselect
   Depends: 
-dpkg (= 1.13.1),
 libgettext8-shlibs,
 libncursesw5-shlibs (= 5.6+20070908)
   
+  RuntimeDepends: 
+dpkg (= 1.13.1)
+  
   Conflicts: 
 dpkg-ftp,
 dpkg-multicd


--
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=5127iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo jetring.info, 1.2, 1.3 javascript-common.info, 1.2, 1.3

2013-09-09 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3582

Modified Files:
jetring.info javascript-common.info 
Log Message:
few small tweaks I forgot to commit

Index: jetring.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/jetring.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jetring.info23 Jun 2013 18:43:39 -  1.2
+++ jetring.info9 Sep 2013 15:03:07 -   1.3
@@ -23,7 +23,6 @@
   perl -pi -e 's,\$type\.,g\.\$type\.,g' jetring-checksum
   perl -pi -e 's,gpg,gpg2,g' jetring-accept jetring-apply jetring-build 
jetring-diff jetring-explode jetring-gen jetring-review jetring-signindex 
   perl -pi -e 's,\.gpg2,\.gpg,g' jetring-accept jetring-apply jetring-build 
jetring-diff jetring-explode jetring-gen jetring-review jetring-signindex 
-  perl -pi -e 's,jetring-build,\.\.\/jetring-build,g' example/Makefile
 
 
 CompileScript: 

Index: javascript-common.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/javascript-common.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- javascript-common.info  13 Aug 2013 21:16:25 -  1.2
+++ javascript-common.info  9 Sep 2013 15:03:07 -   1.3
@@ -19,7 +19,6 @@
 
 CompileScript: echo
 InstallScript: 
-### Requires Root or chroot
 #dh install --with apache2
 
 install -d -m755 %i/share/javascript


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debconf.info,1.14,1.15

2013-09-09 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3358

Modified Files:
debconf.info 
Log Message:
  * Fix warning when %p/var/cache/debconf is missing.
Closes: #709928
  * debconf-set-selections: Do not change the default template
value when overriding the value of existing questions. Closes: #711693


Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- debconf.info28 May 2013 20:42:58 -  1.14
+++ debconf.info9 Sep 2013 14:59:52 -   1.15
@@ -1,5 +1,5 @@
 Package: debconf
-Version: 1.5.50
+Version: 1.5.51
 Revision: 1
 Type: perl
 ###
@@ -35,7 +35,7 @@
 
 ###
 Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 99cfa20ec28c2af63f2e73b1347a52b6
+Source-MD5: 9127880a0e03dfa2ee9a691162440651
 SourceDirectory: %n
 TarFilesRename: debconf/debconf$:debconf/debconf.tmp
 ###


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dbd-mysql-pm.info,1.4,1.5

2013-09-09 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3490

Modified Files:
dbd-mysql-pm.info 
Log Message:
Update to current stable version with my tweaks for my mysql

Index: dbd-mysql-pm.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dbd-mysql-pm.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbd-mysql-pm.info   3 Aug 2012 05:18:49 -   1.4
+++ dbd-mysql-pm.info   9 Sep 2013 15:01:51 -   1.5
@@ -1,17 +1,24 @@
 Info2: 
 Package: dbd-mysql-pm%type_pkg[perl]
-Version: 4.021
+Version: 4.023
 Revision: 1.1
-Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
-Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4, 
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] = 
5100) 10.5, (%type_pkg[perl] = 5100) 10.6, (%type_pkg[perl] = 5123) 10.7, 
(%type_pkg[perl] = 588) 10.4, (%type_pkg[perl] = 588) 10.5, (%type_pkg[perl] = 
588) 10.6, (%type_pkg[perl] = 5123) 10.7, (%type_pkg[perl] = 5124) 10.8
 Description: Perl5 Database Interface to MySQL
-Type: perl (5.8.1 5.8.4 5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
+Type: perl (5.12.3 5.12.4)
 License: Artistic
 Maintainer: Christian Schaffner chri...@users.sourceforge.net
 
 # Dependencies:
-Depends: perl%type_pkg[perl]-core, mysql-unified-shlibs | 
libmysqlclient18-shlibs, dbi-pm%type_pkg[perl] (= 1.37-2), data-showtable-pm
-BuildDepends: mysql-unified-dev | libmysqlclient18-dev, fink (= 0.20.1-1), 
extutils-makemaker-pm%type_pkg[perl]
+Depends: 
+   data-showtable-pm,
+   dbi-pm%type_pkg[perl] (= 1.37-2),
+   mysql-unified-shlibs | libmysqlclient18-shlibs,
+   perl%type_pkg[perl]-core
+
+BuildDepends: 
+   extutils-makemaker-pm%type_pkg[perl],
+   fink-package-precedence,
+   mysql-unified-dev | libmysqlclient18-dev
+
 Replaces: dbd-mysql-pm (= 2.1026-1), dbd-mysql-pm560, dbd-mysql-pm580, %N-man
 Conflicts: %N-man
 PostInstScript: 
@@ -26,7 +33,7 @@
 
 # Unpack Phase:
 Source: mirror:cpan:authors/id/C/CA/CAPTTOFU/DBD-mysql-%v.tar.gz
-Source-MD5: 35653efca4bbe6e49ef31d237b4a50b7
+Source-MD5: 6ee956cf33ddce6441b36b6c1c983528
 
 # Patch Phase:
 PatchScript: 
@@ -34,12 +41,16 @@
 
 
 # Compile Phase:
-ConfigureParams: --nocatchstderr --mysql_config=%p/bin/mysql_config
+ConfigureParams: --mysql_config=%p/bin/mysql_config DEFINE=-MD
+CompileScript: 
+   %{default_script}
+   fink-package-precedence --depfile-ext='\.d' .
+
 NoPerlTests: true
 
 # Install Phase:
 UpdatePOD: true
-DocFiles: README INSTALL.html ChangeLog LICENSE
+DocFiles: ChangeLog INSTALL.html LICENSE README* TODO
 InstallScript: 
   %{default_script}
   mv %i/share/man %i/lib/perl5/%type_raw[perl]
@@ -57,10 +68,6 @@
 DescPort: 
 Disabled default tests since 'make test' normally
 wouldn't pass: it needs a running mysql server
-Can't use default CompileScript on 10.3 so we can add --nocatchstderr (work 
around perl config bug)
-
-ABSPERL hack to make makemaker in perl 5.8.8 happy. It was using the wrong 
-ABSPERL path, pointing to the build directory instead of /sw/bin/perl...
 
 Homepage: http://search.cpan.org/dist/DBD-mysql
 


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/devel po4a.info,1.4,1.5

2013-09-09 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24761

Modified Files:
po4a.info 
Log Message:
  * New upsteam release
  * Patched for installing into /usr/local by default


Index: po4a.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/po4a.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- po4a.info   26 Jul 2012 15:11:26 -  1.4
+++ po4a.info   9 Sep 2013 22:34:05 -   1.5
@@ -1,14 +1,16 @@
 Package: po4a
-Version: 0.42
-Revision: 4
+Version: 0.45
+Revision: 1
 ###
 ## System module-build works fine module-build-pm
+###   *  Unicode::GCString is not installed (Unicode-LineBreak)
 BuildDepends: docbook-dtd, docbook-xsl, gettext-tools, sgmls-pm, 
term-readkey-pm5123 | term-readkey-pm5124, libxslt-bin
 Depends: gettext-tools, sgmls-pm, opensp-bin
-Recommends: locale-gettext-pm5123, term-readkey-pm5123, text-wrapi18n-pm5123
+###   *  Unicode::GCString is not installed
+Recommends: locale-gettext-pm5123 | locale-gettext-pm5124, term-readkey-pm5123 
| term-readkey-pm5124, text-wrapi18n-pm5123 | text-wrapi18n-pm5124
 ###
 Source: mirror:debian:/pool/main/p/%n/%n_%v.orig.tar.gz
-Source-MD5: cf2d342f4831490cc17524fd6c40ca75
+Source-MD5: 423bdf5c39f30e63a808b84c5d9d1899
 SourceDirectory: %n-%v
 ###
 DocFiles: changelog COPYING NEWS README* TODO
@@ -18,8 +20,10 @@
 perl -pi -e 's,nsgmls,onsgmls,g' lib/Locale/Po4a/Sgml.pm
 
 # Show %p/bin not /usr/bin
-for i in %b/po/bin/*.po; do \
-  perl -pi -e 's,/usr/bin,%p/bin,g' $i; \
+BASE=$(echo %p | perl -pi -e 's,/,,'); \
+for i in %b/po/bin/*.po %b/po/bin/*.pot %b/po/pod/*.po %b/po/pod/*.pot 
lib/Locale/Po4a/Pod.pm; do \
+  perl -pi -e 's,/usr/,%p/,g' $i; \
+  perl -pi -e 's,usr/,${BASE}/,g' $i; \
   perl -pi -e 's,nsgmls,onsgmls,g' $i; \
 done 
 perl -pi -e 's,/usr/local,%p,g' po/bin/Makefile;
@@ -37,6 +41,9 @@
 ### Fix for msgmerge 0.17 
 # 
http://subcommanderblog.wordpress.com/2009/05/16/msgmerge-on-macosx-and-no-such-file-or-directory/
 perl -pi -e 's,msgmerge \$msgmerge_opt,msgmerge --backup=off \$msgmerge_opt,g' 
po4a-updatepo
+
+### Fix for man pages installing to /usr/local
+perl -pi -e 
's,install_sets[\(]\$self-(.)installdirs[\)]-.(\{)(.)bindoc.,install_path\(\)-\1\2\3bindoc\3,g'
 Po4aBuilder.pm
 
 ###
 CompileScript: 
@@ -54,9 +61,6 @@
 InstallScript: 
 ./Build install --install_path lib=%p/lib/perl5 --install_path 
arch=%p/lib/perl5/darwin-thread-multi-2level --install_path script=%p/bin 
--install_path bin=%p/bin --install_path bindoc=%p/share/man/man1 
--install_path libdoc=%p/share/man/man3 --install_path 
binhtml=%p/share/man/man1 --install_path libhtml=%p/share/man/man3 destdir=%d
 sed -i -e '1s|^#! /usr/bin/env perl|#! /usr/bin/perl|' %i/bin/*
-### Can't figure out why it installs to /usr/local/share/man/po
-mv %d/usr/local/* %i
-rm -rf %d/usr
 
 ###
 Description: Tools for helping translation of docs


--
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=5127iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info, 1.19, 1.20 php5.patch, 1.14, 1.15

2013-09-09 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24859

Modified Files:
php5.info php5.patch 
Log Message:
  * Removed gd-libJPEG-Version.patch as it is no longer required
  * Removed libxml2_ABIfix.patch as it is no longer required
  * New upstream version 5.5.3+dfs
  * Update patches for 5.5.3 release
  * New upstream version 5.5.2+dfsg
  * Update and refresh patches for 5.5.2 release
  * Add handling for mpm_itk to libapache2-mod-php5{,filter}
(Closes: #720278)
  * Add php5-readline to php5-cli Recommends to hint that it's needed
for functional php -a


Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- php5.info   28 Aug 2013 15:40:28 -  1.19
+++ php5.info   9 Sep 2013 22:35:16 -   1.20
@@ -1,8 +1,8 @@
 Info2: 
 Package: php5
-Version: 5.5.1
-Revision: 2.1
-Type: sapiver (20121212)
+Version: 5.5.3
+Revision: 1.1
+Type: sapiver (20121212), embedver (5)
 ###
 BuildDepends: 
fink (= 0.34.99.git),
@@ -119,12 +119,12 @@
 
 ###
 Source: mirror:custom:distributions/php-%v.tar.gz
-Source-MD5: a7d9598c0e60b47960b8e803e51c4309
+Source-MD5: a5dfdd41ccf539942db966310f7429da
 Source2: mirror:debian:/pool/main/p/php5/php5_%v+dfsg-1.debian.tar.gz
-Source2-MD5: 690d4b78319a0a57d0c224fe976bb536
+Source2-MD5: 6988c4ad9f9ddb37c7f04c91542cbc7b
 Source2ExtractDir: php-%v
 PatchFile: %n.patch
-PatchFile-MD5: 8b67afe7604c279ef49b96da926d8892
+PatchFile-MD5: e9b283912e327d58b51851884b1318c4
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -190,8 +190,6 @@
 
 ### Fink Specific stuff
   patch -p1  fink/patches/giconv_is_inferior.patch
-  ##patch -p1  fink/patches/gd-libJPEG-Version.patch
-  ##patch -p1  fink/patches/libxml2_ABIfix.patch
 
   ## Patch debian dir for debhelper stuff
   perl -pi -e 's,.libs,libs,g' debian/*.apache2
@@ -575,8 +573,8 @@
 install -m644 fink/debhelper/php5-maintscript-helper 
debian/php5-common%p/share/php5/
 
 # install embed SAPI
-install -d -m755 debian/libphp5-embed4
-cd embed-build  make install-headers install-build install-sapi 
install-programs INSTALL_ROOT=%b/debian/libphp5-embed4
+install -d -m755 debian/libphp5-embed%type_raw[embedver]
+cd embed-build  make install-headers install-build install-sapi 
install-programs INSTALL_ROOT=%b/debian/libphp5-embed%type_raw[embedver]
 
 # install the apache modules' files
 install -d -m755 debian/libapache2-mod-php5
@@ -626,7 +624,7 @@
 
 # install extensions
 ext=`debian/libapache2-mod-php5%p/bin/php-config --extension-dir`;\
-for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli 
libphp5-embed4 php5-fpm; do \
+for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli 
libphp5-embed%type_raw[embedver] php5-fpm; do \
install -d -m755 debian/$i/${ext}; \
 done; \
 cat fink/modulelist fink/extramodulelist | while read package extname dsoname 
priority; do \
@@ -674,14 +672,14 @@
 install -m 755 fink/php5-fpm-checkconf debian/php5-fpm%p/lib/php5/
 
 # move and install -dev files
-cp -a debian/libphp5-embed4/* debian/php5-dev/
+cp -a debian/libphp5-embed%type_raw[embedver]/* debian/php5-dev/
 cp -a debian/libapache2-mod-php5/* debian/php5-dev/
-rm -rf debian/libphp5-embed4%p/include/ \
-   debian/libphp5-embed4%p/bin/ \
-   debian/libphp5-embed4%p/lib/php5/build/ \
-   debian/libphp5-embed4%p/lib/php5/%type_raw[sapiver] \
-   debian/libphp5-embed4%p/lib/libphp5.dylib \
-   debian/libphp5-embed4%p/share/man/
+rm -rf debian/libphp5-embed%type_raw[embedver]%p/include/ \
+   debian/libphp5-embed%type_raw[embedver]%p/bin/ \
+   debian/libphp5-embed%type_raw[embedver]%p/lib/php5/build/ \
+   debian/libphp5-embed%type_raw[embedver]%p/lib/php5/%type_raw[sapiver] \
+   debian/libphp5-embed%type_raw[embedver]%p/lib/libphp5.dylib \
+   debian/libphp5-embed%type_raw[embedver]%p/share/man/
 rm -rf debian/libapache2-mod-php5%p/lib/php5/build/ \
debian/libapache2-mod-php5%p/include/ \
debian/libapache2-mod-php5%p/bin/ \
@@ -736,8 +734,8 @@
 install -m755 fink/php5query debian/php5-common%p/sbin/php5query
 
 # remove libtool files
-rm -f debian/libphp5-embed4%p/lib/libphp5.la
-rm -rf debian/libphp5-embed4%p/lib/php5
+rm -f debian/libphp5-embed%type_raw[embedver]%p/lib/libphp5.la
+rm -rf debian/libphp5-embed%type_raw[embedver]%p/lib/php5
 
 # directories cleanup:
 rm -rf debian/php-pear%p/share/lintian
@@ -809,16 +807,16 @@
touch debian/php5-${sapi}%p/share/php5/sapi/${sapi}; \
done; \
for sapi in embed; do \
-   install -d -m755 debian/libphp5-${sapi}4/DEBIAN; \
+   install -d -m755 
debian/libphp5-${sapi}%type_raw[embedver]/DEBIAN; \
sed -e s/@sapi@/${sapi}/g; \
-   

[cvs] experimental/thesin/finkinfo debhelper.info,1.1,1.2

2013-09-03 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31800

Modified Files:
debhelper.info 
Log Message:
  * dh_python: Removed this deprecated and unused command.
Closes: #717374
(Thanks, Luca Falavigna)
  * Type fixes. Closes: #719216
  * dh_installinit: Fix a longstanding accidental behavior that caused
a file named debian/package to be installed as the init script.
Only fixed in v10 since packages might depend on this behavior.
Closes: #719359
  * dh_install, dh_installdocs, dh_clean: Fix uses of find -exec
which cause it to ignore exit status of the commands run.
Closes: 719598
  * makefile buildsystem: Tighten heuristic to detect if makefile target
exists. An error message that some other target does not exist just means
the makefile spaghetti has problems later on when run with -n,
but not that the called target didn't exist. Closes: #718121


Index: debhelper.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debhelper.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debhelper.info  13 Aug 2013 22:10:46 -  1.1
+++ debhelper.info  3 Sep 2013 20:20:16 -   1.2
@@ -1,10 +1,8 @@
 Package: debhelper
-Version: 9.20130630
+Version: 9.20130720
 Revision: 1
 ###
 ## po4a
-BuildDepends: 
-
 Depends: 
file (= 3.23),
dpkg (= 1.16.2),
@@ -14,7 +12,7 @@
 Suggests: dh-make
 ###
 Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 4f968d872de868fbd34c73943aee7ad6
+Source-MD5: 7ca139c0b53d604c41e423fea4fecda4
 SourceDirectory: %n
 ###
 PatchScript: 


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.48,1.49

2013-09-02 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19997

Modified Files:
dpkg.info 
Log Message:
Proper bash float compare

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- dpkg.info   30 Aug 2013 17:38:20 -  1.48
+++ dpkg.info   3 Sep 2013 04:24:51 -   1.49
@@ -72,7 +72,7 @@
 
 # Fix for tar (Slightly modified for dpkg-bootstrap)
 if [ %n = dpkg-bootstrap ]; then \
-  if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2`  10.8 ]; then \
+  if [[ $(/usr/bin/sw_vers -productVersion)  10.8 ]]; then \
 perl -pi -e 's,\tar\,\/usr/bin/tar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
 perl -pi -e 's,--warning=no-timestamp,-v,g' dpkg-deb/extract.c; \
 perl -pi -e 's,--format=gnu,--format=ustar,g' dpkg-deb/build.c; \


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.47,1.48

2013-08-30 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14384

Modified Files:
dpkg.info 
Log Message:
-Wno-deprecated-writable-strings is not avail in 10.6 gcc4.2

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- dpkg.info   27 Aug 2013 20:22:20 -  1.47
+++ dpkg.info   30 Aug 2013 17:38:20 -  1.48
@@ -96,7 +96,7 @@
 perl -pi -e 's,localedir = \@localedir\@,localedir = \@localedir\@-perl,g' 
scripts/Makefile.in scripts/po/Makefile.in.in
 
 
-SetCFLAGS: -g -O2 -fstack-protector -Wformat -fPIE 
-F/System/Library/Frameworks/CoreFoundation.framework -Wno-unused-parameter 
-Wno-missing-field-initializers -Wno-cast-align -Wno-format-security 
-Wno-deprecated-writable-strings
+SetCFLAGS: -g -O2 -fstack-protector -Wformat -fPIE 
-F/System/Library/Frameworks/CoreFoundation.framework -Wno-unused-parameter 
-Wno-missing-field-initializers -Wno-cast-align -Wno-format-security
 SetCPPFLAGS: -D_FORTIFY_SOURCE=2
 SetCXXFLAGS: -g -O2 -fstack-protector -Wformat -fPIE
 SetLDFLAGS: -Wl,-read_only_stubs -Wl,-bind_at_load -fPIE -Wl,-pie -framework 
CoreFoundation


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info,1.18,1.19

2013-08-28 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10291

Modified Files:
php5.info 
Log Message:
Version depends for libxml2 for the compatibility_version (apt hint)

Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- php5.info   16 Aug 2013 23:25:10 -  1.18
+++ php5.info   28 Aug 2013 15:40:28 -  1.19
@@ -39,7 +39,7 @@
libpng16,
libtidy-0.99.0-dev,
libtool2,
-   libxml2 ( 2.9.0),
+   libxml2 (= 2.9.0-1),
libxslt,
mysql-unified-dev | libmysqlclient18-dev,
libnetsnmp30-dev,
@@ -978,7 +978,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1)
openssl100-shlibs,
qdbm14-shlibs
   
@@ -1614,7 +1614,7 @@
phpapi-%type_raw[sapiver],
%N-common (= %v-%r),
libiconv,
-   libxml2-shlibs
+   libxml2-shlibs (= 2.9.1-1)
   
   InstallScript: 
 cp -a debian/%n%p/* %i/
@@ -1644,7 +1644,7 @@
phpapi-%type_raw[sapiver],
%N-common (= %v-%r),
libiconv,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1),
libxslt-shlibs
   
   InstallScript: 
@@ -1684,7 +1684,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1),
openssl100-shlibs,
qdbm14-shlibs
   
@@ -1730,7 +1730,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1),
openssl100-shlibs,
qdbm14-shlibs
   
@@ -1776,7 +1776,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1),
openssl100-shlibs,
qdbm14-shlibs
   
@@ -1821,7 +1821,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1),
openssl100-shlibs,
qdbm14-shlibs
   
@@ -1853,7 +1853,7 @@
libiconv,
libonig2-shlibs,
libpcre1-shlibs,
-   libxml2-shlibs,
+   libxml2-shlibs (= 2.9.1-1),
openssl100-shlibs,
qdbm14-shlibs
   


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.46,1.47

2013-08-27 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26415

Modified Files:
dpkg.info 
Log Message:
BC no longer required

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- dpkg.info   24 Jun 2013 03:00:55 -  1.46
+++ dpkg.info   27 Aug 2013 20:22:20 -  1.47
@@ -12,12 +12,6 @@
   libncursesw5,
   bzip2-dev
 
-BuildConflicts: 
-  ( %m = powerpc ) gcc45, 
-  ( %m = powerpc ) gcc46, 
-  ( %m = powerpc ) gcc47,
-  ( %m = powerpc ) gcc48
-
 Depends: 
   bzip2-shlibs,
   libgettext8-shlibs,


--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo apt.info, 1.4, 1.5 apt.patch, 1.3, 1.4

2013-08-27 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30259

Modified Files:
apt.info apt.patch 
Log Message:
  * pick up Translation-* even if only compressed available (Closes: 717665)
  * request absolute URIs from proxies again (0.9.9.3 regession)
(Closes: 717891)
  * fix missing changelog entry for 0.9.9.3 (git-dch issue)
  * debian/apt.auto-removal.sh:
- do not include debug symbol packages for the kernel in the 
  blacklist (closes: #717616)
  * debian/apt.postinst:
- run /etc/kernel/postinst.d/apt-auto-removal once on upgrade
  to ensure that the correct auto-removal list is generated
  (closes: #717615)
  * skip all Description fields in apt-cache, not just first (Closes: 717254)
  * fix 'apt-cache search' crash with missing description (Closes: 647590)
  * Do not send a connection: keep-alive, at all
  * Vietnamese updated by Tran Ngoc Quan. Closes: #717016
  * fix if-clause to generate hook-info for 'rc' packages (Closes: 717006)
  * apt-pkg/packagemanager.cc:
- increate APT::pkgPackageManager::MaxLoopCount to 5000
  * cherry pick debian/apt.auto-removal.sh feature from the
ubuntu/master branch
  * debian/apt.conf.autoremove: don't include linux-image*,
linux-restricted-modules*, and linux-ubuntu-modules* packages in the
list to never be autoremoved.
  * debian/apt.auto-removal.sh, debian/rules, debian/apt.dirs: install new
script to /etc/kernel/postinst.d/ which ensures we only automatically
keep the currently-running kernel, the being-installed kernel, and the
newest kernel, so we don't fill /boot up with an unlimited number of
kernels.  LP: #923876.
  * Fix up two things in debian/apt.auto-removal.sh:
- Use exact matches with $-terminated regexes, so we don't get
  confusion between similarly-named kernel flavours.
- Keep linux-backports-modules in sync with installed kernels.
  * Version 3 for DPkg::Pre-Install-Pkgs with MultiArch info (Closes: #712116)
  * implement arch+= and arch-= for sources.list
  * prevent MarkInstall of unsynced Multi-Arch:same siblings
  * improve debug output for the Debug::pkgProblemResolver and
Debug::pkgDepCache::AutoInstall
  * improve apt-cdrom output when no CD-ROM can be auto-detected
  * document --no-auto-detect in apt-cdrom
  * build the en manpages in subdirectory doc/en
  * remove -ldl from cdrom and -lutil from apt-get linkage
  * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting
(Closes: 645713)
  * prefer Essentials over Removals in ordering score
  * fix priority sorting by prefering higher in MarkInstall
  * try all providers in order if uninstallable in MarkInstall
  * do unpacks before configures in SmartConfigure (Closes: #707578)
  * fix support for multiple patterns in apt-cache search (Closes: #691453)
  * set Fail flag in FileFd on all errors consistently
  * don't explicitly init ExtractTar InFd with invalid fd
  * OpenDescriptor should autoclose fd always on error (Closes: #704608)
  * fail in CopyFile if the FileFds have error flag set
  * ensure state-dir exists before coyping cdrom files
  * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921)
  * handle missing Description in apt-cache show (Closes: #712435)
  * try defaults if auto-detection failed in apt-cdrom (Closes: #712433)
  * support \n and \r\n line endings in ReadMessages
  * do not redownload unchanged InRelease files
  * trigger NODATA error for invalid InRelease files (Closes: #712486)


Index: apt.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apt.patch   21 Jun 2013 04:13:59 -  1.3
+++ apt.patch   27 Aug 2013 21:33:02 -  1.4
@@ -1,10 +1,22 @@
-diff -ruN apt-0.9.8.2.orig/fink/patches/darwin-fixes.patch 
apt-0.9.8.2/fink/patches/darwin-fixes.patch
 apt-0.9.8.2.orig/fink/patches/darwin-fixes.patch   1969-12-31 
17:00:00.0 -0700
-+++ apt-0.9.8.2/fink/patches/darwin-fixes.patch2013-06-19 
20:00:38.0 -0600
-@@ -0,0 +1,537 @@
-+diff -ruN apt-0.9.8.2.orig/apt-pkg/contrib/macros.h 
apt-0.9.8.2/apt-pkg/contrib/macros.h
-+--- apt-0.9.8.2.orig/apt-pkg/contrib/macros.h 2013-06-06 11:25:59.0 
-0600
- apt-0.9.8.2/apt-pkg/contrib/macros.h  2013-06-18 11:55:07.0 
-0600
+diff -ruN apt-0.9.9.4.orig/fink/patches/darwin-fixes.patch 
apt-0.9.9.4/fink/patches/darwin-fixes.patch
+--- apt-0.9.9.4.orig/fink/patches/darwin-fixes.patch   1969-12-31 
17:00:00.0 -0700
 apt-0.9.9.4/fink/patches/darwin-fixes.patch2013-08-27 
15:23:36.0 -0600
+@@ -0,0 +1,558 @@
[...4399 lines suppressed...]
+++   SigWinch(0);
+++
+++   // Match the operation
+++   CmdL.DispatchArg(Cmds);
+++
+++   // Print any errors or warnings found during parsing
+++   bool const Errors = 

[cvs] experimental/thesin/finkinfo apache2.info, 1.1, 1.2 apache2.patch, 1.1, 1.2

2013-08-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25422

Modified Files:
apache2.info apache2.patch 
Log Message:
  * Fix module dependencies in lbmethod_*.load files. Closes: #717910
LP: #1205314
  * Backport open_htaccess hook from upstream 2.4.x branch to allow
building mpm-itk as separate package.
  * Improve comment for LogLevel in apache2.conf. Closes: #718677
  * Fix comment in ports.conf. Closes: #718650


Index: apache2.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apache2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2.info13 Aug 2013 22:10:46 -  1.1
+++ apache2.info23 Aug 2013 15:40:21 -  1.2
@@ -1,6 +1,6 @@
 Package: apache2
 Version: 2.4.6
-Revision: 2.1
+Revision: 3.1
 ###
 Provides: httpd
 BuildDepends: 
@@ -37,7 +37,7 @@
 Source-MD5: 6c17dafd009ef8ffb5ccc9481d1e6441
 ###
 PatchFile: %n.patch
-PatchFile-MD5: a580e350929025b79441cd4eda5b964a
+PatchFile-MD5: 58e283d7e4dff01df29fc2abab183e4b
 PatchScript: 
 BASE=$(echo %p | perl -pi -e 's,/,,'); \
 sed -e 's,@FINKPREFIX@,%p,g' -e s,@FINKBASE@,${BASE},g %{PatchFile} | patch 
-p1
@@ -46,11 +46,11 @@
 #patch -p1  fink/patches/make_include_safe.patch # Probably to be droped in 
2.4
 patch -p1  fink/patches/fhs_compliance.patch
 #patch -p1  fink/patches/suexec_is_shared.patch # Probably not needed in 2.4
-patch -p1  fink/patches/dbm_read_hash_or_btree.patch
 patch -p1  fink/patches/no_LD_LIBRARY_PATH.patch
 patch -p1  fink/patches/suexec-CVE-2007-1742.patch
 patch -p1  fink/patches/customize_apxs.patch
 patch -p1  fink/patches/build_suexec-custom.patch
+patch -p1  fink/patches/open_htaccess_hook.patch
 # The patch below must not be applied by quilt at extraction time.  It depends
 # on some script-fu to be executed before. Have a look
 # to debian/rules' prepare-custom-suexec target.

Index: apache2.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apache2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2.patch   13 Aug 2013 22:10:46 -  1.1
+++ apache2.patch   23 Aug 2013 15:40:21 -  1.2
@@ -1938,7 +1938,7 @@
 +complete -F _a2disconf a2disconf
 diff -ruN httpd-2.4.6.orig/fink/config-dir/apache2.conf 
httpd-2.4.6/fink/config-dir/apache2.conf
 --- httpd-2.4.6.orig/fink/config-dir/apache2.conf  1969-12-31 
17:00:00.0 -0700
-+++ httpd-2.4.6/fink/config-dir/apache2.conf   2013-08-06 18:53:14.0 
-0600
 httpd-2.4.6/fink/config-dir/apache2.conf   2013-08-23 09:28:52.0 
-0600
 @@ -0,0 +1,221 @@
 +# This is the main Apache server configuration file.  It contains the
 +# configuration directives that give the server its instructions.
@@ -2070,7 +2070,7 @@
 +ErrorLog ${APACHE_LOG_DIR}/error.log
 +
 +#
-+# LogLevel: Control the number of messages logged to the error_log.
++# LogLevel: Control the severity of messages logged to the error_log.
 +# Available values: trace8, ..., trace1, debug, info, notice, warn,
 +# error, crit, alert, emerg.
 +# It is also possible to configure the log level for particular modules, e.g.
@@ -3866,27 +3866,27 @@
 +LoadModule info_module @FINKPREFIX@/lib/apache2/modules/mod_info.so
 diff -ruN 
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bybusyness.load 
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bybusyness.load
 --- httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bybusyness.load   
1969-12-31 17:00:00.0 -0700
-+++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bybusyness.load
2013-08-07 21:46:20.0 -0600
 httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bybusyness.load
2013-08-23 09:29:43.0 -0600
 @@ -0,0 +1,2 @@
-+# Depends: mod_proxy_balancer
++# Depends: proxy_balancer
 +LoadModule lbmethod_bybusyness_module 
@FINKPREFIX@/lib/apache2/modules/mod_lbmethod_bybusyness.so
 diff -ruN 
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_byrequests.load 
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_byrequests.load
 --- httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_byrequests.load   
1969-12-31 17:00:00.0 -0700
-+++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_byrequests.load
2013-08-07 21:46:31.0 -0600
 httpd-2.4.6/fink/config-dir/mods-available/lbmethod_byrequests.load
2013-08-23 09:29:56.0 -0600
 @@ -0,0 +1,2 @@
-+# Depends: mod_proxy_balancer
++# Depends: proxy_balancer
 +LoadModule lbmethod_byrequests_module 
@FINKPREFIX@/lib/apache2/modules/mod_lbmethod_byrequests.so
 diff -ruN 
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bytraffic.load 
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bytraffic.load
 --- 

[cvs] experimental/thesin/finkinfo php5.info, 1.17, 1.18 php5.patch, 1.13, 1.14

2013-08-16 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29860

Modified Files:
php5.info php5.patch 
Log Message:
  * Move apache2 (= 2.4) from Pre-Depend to Depends (Closes: #711454)
  * Install the headers from CGI build to get mysqlnd headers into
php5-dev package (Closes: #690395)
  * Use small helper script instead of shell blog to check FPM
configuration (Closes: #718627)


Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- php5.info   15 Aug 2013 03:31:29 -  1.17
+++ php5.info   16 Aug 2013 23:25:10 -  1.18
@@ -1,7 +1,7 @@
 Info2: 
 Package: php5
 Version: 5.5.1
-Revision: 1.1
+Revision: 2.1
 Type: sapiver (20121212)
 ###
 BuildDepends: 
@@ -124,7 +124,7 @@
 Source2-MD5: 690d4b78319a0a57d0c224fe976bb536
 Source2ExtractDir: php-%v
 PatchFile: %n.patch
-PatchFile-MD5: 7af2178ba01c6c88649cfd4db9f2ffa3
+PatchFile-MD5: 8b67afe7604c279ef49b96da926d8892
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -581,6 +581,11 @@
 # install the apache modules' files
 install -d -m755 debian/libapache2-mod-php5
 cd apache2-build  make install-headers install-build install-modules 
install-programs INSTALL_ROOT=%b/debian/libapache2-mod-php5
+
+# install the headers from cgi-build
+install -d -m755 debian/php5-dev
+cd cgi-build  make install-headers INSTALL_ROOT=%b/debian/php5-dev
+
 # remove netware and win32 headers that we don't want
 cd debian/libapache2-mod-php5%p/include/php5/  \
rm -f TSRM/readdir.h \
@@ -665,8 +670,10 @@
 sed -nr '/('''|\[)www('''|\])/{h;p;d};x;/www/{x;p}'  
fpm-build/sapi/fpm/php-fpm.conf \
  debian/php5-fpm%p/etc/php5/fpm/pool.d/www.conf
 
+# install a helper script for checking PHP FPM configuration
+install -m 755 fink/php5-fpm-checkconf debian/php5-fpm%p/lib/php5/
+
 # move and install -dev files
-install -d -m755 debian/php5-dev
 cp -a debian/libphp5-embed4/* debian/php5-dev/
 cp -a debian/libapache2-mod-php5/* debian/php5-dev/
 rm -rf debian/libphp5-embed4%p/include/ \
@@ -738,7 +745,7 @@
 rm -rf debian/php5-dev%p/lib/apache2
 rm -rf debian/php5-dev%p/etc/apache2
 rm -rf debian/php5-dev%p/lib/php5/%type_raw[sapiver]
-rm -rf debian/php5-fpm%p/lib
+rm -rf debian/php5-fpm%p/lib/php5/%type_raw[sapiver]
 rm -rf debian/php5-cli%p/lib
 rm -rf debian/php5-cgi%p/lib/php5
 # find debian/php-pear -type d -exec grmdir --ignore-fail-on-non-empty -p '{}' 
\; /dev/null 21
@@ -897,6 +904,7 @@
 install -d -m755 debian/php5-fpm%p/etc/php5/fpm/conf.d
 install -d -m755 debian/php5-fpm%p/etc/php5/fpm/pool.d
 install -d -m755 debian/php5-fpm%p/sbin
+install -d -m755 debian/php5-fpm%p/lib/php5
 
 #php-pear.dirs
 install -d -m755 debian/php-pear%p/share/doc/php-pear/PEAR

Index: php5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- php5.patch  15 Aug 2013 03:31:29 -  1.13
+++ php5.patch  16 Aug 2013 23:25:10 -  1.14
@@ -6484,10 +6484,23 @@
 +   cp -a @FINKPREFIX@/var/lib/php5/module/ @FINKPREFIX@/var/lib/php5/modules/
 +   rm -rf @FINKPREFIX@/var/lib/php5/module/
 +fi
+diff -ruN php-5.5.1.orig/fink/php5-fpm-checkconf 
php-5.5.1/fink/php5-fpm-checkconf
+--- php-5.5.1.orig/fink/php5-fpm-checkconf 1969-12-31 17:00:00.0 
-0700
 php-5.5.1/fink/php5-fpm-checkconf  2013-08-16 16:49:50.0 -0600
+@@ -0,0 +1,9 @@
++#!/bin/sh
++set -e
++errors=$(@FINKPREFIX@/sbin/php5-fpm --fpm-config 
@FINKPREFIX@/etc/php5/fpm/php-fpm.conf -t 21 | grep \[ERROR\] || true);
++if [ -n ${errors} ]; then
++echo Please fix your configuration file...
++echo ${errors}
++exit 1
++fi
++exit 0
 diff -ruN php-5.5.1.orig/fink/php5-fpm.init php-5.5.1/fink/php5-fpm.init
 --- php-5.5.1.orig/fink/php5-fpm.init  1969-12-31 17:00:00.0 -0700
-+++ php-5.5.1/fink/php5-fpm.init   2013-08-08 16:06:12.0 -0600
-@@ -0,0 +1,174 @@
 php-5.5.1/fink/php5-fpm.init   2013-08-16 16:52:35.0 -0600
+@@ -0,0 +1,167 @@
 +#!/bin/sh
 +### BEGIN INIT INFO
 +# Provides:  php-fpm php5-fpm
@@ -6521,14 +6534,7 @@
 +#
 +do_check()
 +{
-+[ $1 != no ]  $DAEMON $DAEMON_ARGS -t 21 | grep -v \[ERROR\]
-+FPM_ERROR=$($DAEMON $DAEMON_ARGS -t 21 | grep \[ERROR\])
-+
-+if [ -n ${FPM_ERROR} ]; then
-+  echo Please fix your configuration file...
-+  $DAEMON $DAEMON_ARGS -t 21 | grep \[ERROR\]
-+  return 1
-+fi
++@FINKPREFIX@/lib/php5/php5-fpm-checkconf || return 1
 +return 0
 +}
 +
@@ -7731,9 +7737,9 @@
 +exit $ret
 diff -ruN php-5.5.1.orig/fink/phpapi php-5.5.1/fink/phpapi
 --- php-5.5.1.orig/fink/phpapi 1969-12-31 17:00:00.0 -0700
-+++ php-5.5.1/fink/phpapi  2013-08-08 

[cvs] experimental/thesin/finkinfo php5-adodb.info,1.3,1.4

2013-08-14 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6261

Modified Files:
php5-adodb.info 
Log Message:
 * Enable php5.5 config setup


Index: php5-adodb.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5-adodb.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- php5-adodb.info 13 Aug 2013 22:10:46 -  1.3
+++ php5-adodb.info 14 Aug 2013 15:11:03 -  1.4
@@ -47,13 +47,99 @@
 PHP_EX=$(%p/bin/php-config5 --extension-dir); \
 install -d -m 0755 %d/${PHP_EX}; \
 install -m 0644 modules/adodb.so %d/${PHP_EX}/adodb.so
-install -d -m 0755 %i/etc/php5/conf.d
-install -m 0644 fink/adodb.ini %i/etc/php5/conf.d/adodb.ini
+install -d -m755 %i/etc/php5/mods-available/
+install -m 0644 fink/adodb.ini %i/etc/php5/mods-available/adodb.ini
 
 ###
-ConfFiles: %p/etc/php5/conf.d/adodb.ini
+ConfFiles: %p/etc/php5/mods-available/adodb.ini
 DocFiles: CREDITS README.txt
 ###
+PreInstScript: 
+set -e
+
+dpkg-maintscript-helper mv_conffile %p/etc/php5/conf.d/adodb.ini \
+   %p/etc/php5/mods-available/adodb.ini 5.04-1~ -- $@
+
+case $1 in
+install|upgrade)
+;;
+
+abort-upgrade)
+;;
+
+*)
+echo preinst called with unknown argument \`$1' 2
+exit 1
+;;
+esac
+
+exit 0
+
+PostInstScript: 
+set -e
+
+dpkg-maintscript-helper mv_conffile %p/etc/php5/conf.d/adodb.ini \
+   %p/etc/php5/mods-available/adodb.ini 5.04-1~ -- $@
+
+# Verify path in ini file is correct
+EXT_DIR=$(%p/bin/php-config5 --extension-dir)
+if [ -n $EXT_DIR ]; then
+   sed -e s@\(zend_extension=\).*\(adodb.so\)@\1$EXT_DIR/\2@g -i 
%p/etc/php5/mods-available/adodb.ini
+fi
+
+case $1 in
+configure)
+   php5enmod adodb
+;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+;;
+
+*)
+echo postinst called with unknown argument \`$1' 2
+exit 1
+;;
+esac
+
+exit 0
+
+PreRmScript: 
+set -e
+
+case $1 in
+remove|upgrade|deconfigure)
+   php5dismod adodb
+;;
+
+failed-upgrade)
+;;
+
+*)
+echo prerm called with unknown argument \`$1' 2
+exit 1
+;;
+esac
+
+exit 0
+
+PostRmScript: 
+set -e
+
+case $1 in
+purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+   dpkg-maintscript-helper mv_conffile %p/etc/php5/conf.d/adodb.ini \
+   %p/etc/php5/mods-available/adodb.ini 5.04-1~ -- $@
+;;
+
+*)
+echo postrm called with unknown argument \`$1' 2
+exit 1
+;;
+esac
+
+exit 0
+
+###
 Description: Extension optimising the ADOdb library
 DescDetail: 
 It provides up to 100% speedup on some drivers by replacing parts of ADOdb


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info, 1.16, 1.17 php5.patch, 1.12, 1.13

2013-08-14 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8746

Modified Files:
php5.info php5.patch 
Log Message:
 * Few more tweaks to scripts and config files


Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- php5.info   13 Aug 2013 22:10:46 -  1.16
+++ php5.info   15 Aug 2013 03:31:29 -  1.17
@@ -124,7 +124,7 @@
 Source2-MD5: 690d4b78319a0a57d0c224fe976bb536
 Source2ExtractDir: php-%v
 PatchFile: %n.patch
-PatchFile-MD5: 392277d7a5a8d2fdd76a678cf2f2f595
+PatchFile-MD5: 7af2178ba01c6c88649cfd4db9f2ffa3
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -510,9 +510,9 @@
TestScript: 
 #!/bin/sh -ex
 
-MYSQL_PORT=`for i in $(seq 1025 3600 | sort); do nc -z localhost $i || { echo 
$i; exit; } ; done`;
+MYSQL_PORT=`for i in $(seq 1025 3600 | sort); do nc -z localhost ${i} || { 
echo ${i}; exit; } ; done`;
 MYSQL_DATA_DIR=`greadlink -f mysql_db`;
-if [ $MYSQL_PORT == '' ]; then
+if [ ${MYSQL_PORT} == '' ]; then
echo Could not find available port for mysql server;
exit 1;
 fi
@@ -520,8 +520,8 @@
 
 TESTFILE=test-results.txt
 
-if [ -f test-results.txt ]; then \
-   rm test-results.txt; \
+if [ -f ${TESTFILE} ]; then \
+   rm ${TESTFILE}; \
 fi
 
 mkdir -p temp_session_store;
@@ -529,29 +529,29 @@
 sh -x fink/setup-mysql.sh ${MYSQL_PORT} ${MYSQL_DATA_DIR};
 extensions=; \
 for f in apache2-build/modules/*.so; do \
-ext=`basename $f`; \
-test -d ext/${ext%%.so}/tests || continue; \
-test $ext != imap.so || continue; \
-test $ext != interbase.so || continue; \
-test $ext != ldap.so || continue; \
-test $ext != odbc.so || continue; \
-test $ext != pgsql.so || continue; \
-test $ext != pdo_dblib.so || continue; \
-test $ext != pdo_firebird.so || continue; \
-test $ext != pdo_odbc.so || continue; \
-test $ext != pdo_pgsql.so || continue; \
-test $ext != snmp.so || continue; \
-test $ext != opcache.so || continue; \
-extensions=$extensions -d extension=$ext; \
+ext=`basename ${f}`; \
+test -d ext/${ext.so}/tests || continue; \
+test ${ext} != imap.so || continue; \
+test ${ext} != interbase.so || continue; \
+test ${ext} != ldap.so || continue; \
+test ${ext} != odbc.so || continue; \
+test ${ext} != pgsql.so || continue; \
+test ${ext} != pdo_dblib.so || continue; \
+test ${ext} != pdo_firebird.so || continue; \
+test ${ext} != pdo_odbc.so || continue; \
+test ${ext} != pdo_pgsql.so || continue; \
+test ${ext} != snmp.so || continue; \
+test ${ext} != opcache.so || continue; \
+extensions=${extensions} -d extension=${ext}; \
 done; \
-[ $extensions ] || { echo extensions list is empty; exit 1; }; \
+[ ${extensions} ] || { echo extensions list is empty; exit 1; }; \
 env MYSQL_TEST_HOST=127.0.0.1 MYSQL_TEST_PORT=${MYSQL_PORT} 
MYSQL_TEST_SOCKET=${MYSQL_SOCKET} PDO_MYSQL_TEST_HOST=127.0.0.1 
PDO_MYSQL_TEST_PORT=${MYSQL_PORT} PDO_MYSQL_TEST_SOCKET=${MYSQL_SOCKET} 
NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=cgi-build/sapi/cgi/cgi-bin.php5 
TEST_PHP_EXECUTABLE=cli-build/sapi/cli/php \
-cli-build/sapi/cli/php run-tests.php -n -d mysql.default_host=127.0.0.1 -d 
mysql.default_socket=${MYSQL_SOCKET} -d mysqli.default_socket=${MYSQL_SOCKET} 
-d extension_dir=apache2-build/modules/ $extensions| tee ${TESTFILE}
+cli-build/sapi/cli/php run-tests.php -n -d mysql.default_host=127.0.0.1 -d 
mysql.default_socket=${MYSQL_SOCKET} -d mysqli.default_socket=${MYSQL_SOCKET} 
-d extension_dir=apache2-build/modules/ ${extensions} | tee ${TESTFILE}
 rm -rf temp_session_store
 for test in `find . -name '*.log' -a '!' -name 'config.log' -a '!' -name 
'bootstrap.log' -a '!' -name 'run.log'`; do \
 /bin/echo; \
 /bin/echo -n ${test#./}:; \
-cat $test; \
+cat ${test}; \
 echo; \
 done | tee -a ${TESTFILE}
 sh -x fink/setup-mysql.sh ${MYSQL_PORT} ${MYSQL_DATA_DIR} stop
@@ -565,10 +565,10 @@
 install -d -m755 debian/php5-common%p/share/php5
 
 # sanitize php.ini file
-PCNTL_FUNCTIONS=$(cat ext/pcntl/php_pcntl.h | sed -ne /^PHP_FUNCTION/ 
s/PHP_FUNCTION(\(.*\));/\1/;t end;d;:end p | tr '\n' ',');
-cat php.ini-production | tr \t   | sed -e/session.gc_probability =/ 
s/1/0/g;/disable_functions =/ s/$$/ ${PCNTL_FUNCTIONS}/g;  
debian/php5-common%p/share/php5/php.ini-production
-cat php.ini-production | tr \t   | sed -e'/memory_limit =/ 
s/128M/-1/g;/session.gc_probability =/ s/1/0/g'  
debian/php5-common%p/share/php5/php.ini-production.cli
-cat php.ini-development | tr \t   | sed -e/session.gc_probability =/ 
s/1/0/g;/disable_functions =/ s/$$/ ${PCNTL_FUNCTIONS}/g;  
debian/php5-common%p/share/php5/php.ini-development
+PCNTL_FUNCTIONS=$(cat ext/pcntl/php_pcntl.h | sed -ne /^PHP_FUNCTION/ 

[cvs] experimental/thesin/finkinfo ssl-cert.info,1.5,1.6

2013-08-13 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16998

Modified Files:
ssl-cert.info 
Log Message:
  * Update Japanese translation, thanks to victory victory deb gmail com
Closes: 712914


Index: ssl-cert.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/ssl-cert.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ssl-cert.info   13 Sep 2012 16:26:53 -  1.5
+++ ssl-cert.info   13 Aug 2013 19:56:10 -  1.6
@@ -1,10 +1,10 @@
 Package: ssl-cert
-Version: 1.0.32
+Version: 1.0.33
 Revision: 1
 Epoch: 1
 ###
 Source: mirror:debian:/pool/main/s/%n/%n_%v.tar.gz
-Source-MD5: 703f702d3b7c473fb6f78a3fa451792c
+Source-MD5: 8c7e7c875e997825d8d3806ee5e6f4da
 SourceDirectory: %n-%v
 PatchScript: 
   perl -pi -e 's,/usr,%p,g' make-ssl-cert make-ssl-cert.8
@@ -31,11 +31,6 @@
 install -m775 %b/make-ssl-cert %i/sbin
 install -m644 %b/make-ssl-cert.8 %i/share/man/man8
 install -m644 %b/ssleay.cnf %i/share/%n
-
-### Debconf
-#install -d -m 0755 %d/DEBIAN
-#po2debconf debian/templates  debian/templates.merged
-#install -m 0644 debian/templates.merged %d/DEBIAN/templates
 
 ###
 Debconf: 


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo javascript-common.info,NONE,1.1

2013-08-13 Thread Justin F. Hallett
 if empty and not already removed by 
user:
if [ -d %p/etc/apache2/conf.d ]
then
grmdir --ignore-fail-on-non-empty %p/etc/apache2/conf.d
fi
 # This is a work around bug #584185:
if [ -d %p/etc/javascript-common ]
then
grmdir --ignore-fail-on-non-empty %p/etc/javascript-common
fi
fi

exit 0

###
PostRmScript: 
set -e

# summary of how this script can be called:
#* postrm `remove'
#* postrm `purge'
#* old-postrm `upgrade' new-version
#* new-postrm `failed-upgrade' old-version
#* new-postrm `abort-install'
#* new-postrm `abort-install' old-version
#* new-postrm `abort-upgrade' old-version
#* disappearer's-postrm `disappear' overwriter
#  overwriter-version
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

case ${1} in
purge)
if [ -d %p/etc/lighttpd/conf-enabled/ ]
then
grmdir --ignore-fail-on-non-empty 
%p/etc/lighttpd/conf-enabled/
fi
# %p/etc/javascript-common/lighttpd_disabled_by_user is NOT a 
conffile:
if [ -e %p/etc/javascript-common/lighttpd_disabled_by_user ]
then
rm %p/etc/javascript-common/lighttpd_disabled_by_user
fi
if [ -d %p/etc/javascript-common/ ]
then
grmdir --ignore-fail-on-non-empty 
%p/etc/javascript-common/
fi
;;

remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;

*)
echo postinst called with unknown argument \`${1}' 2
exit 1
;;
esac

exit 0

PreRmScript: 
set -e

# summary of how this script can be called:
#* prerm `remove'
#* old-prerm `upgrade' new-version
#* new-prerm `failed-upgrade' old-version
#* conflictor's-prerm `remove' `in-favour' package new-version
#* deconfigured's-prerm `deconfigure' `in-favour'
#  package-being-installed version `removing'
#  conflicting-package version
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

disabled_file_content() {
echo  EOS
This file has been automatically generated by javascript-common during its
uninstallation in order to keep track that you choose to disabled
javascript-alias from lighttpd.
It will disappear if you reinstall javascript-common or if you purge it.
EOS
}


case ${1} in
remove)
# disable our lighttpd conf as soon as possible, hence in prerm
if [ -L %p/etc/lighttpd/conf-enabled/90-javascript-alias.conf ]
then
rm -f 
%p/etc/lighttpd/conf-enabled/90-javascript-alias.conf
if which invoke-rc.d  /dev/null  [ -x 
%p/etc/init.d/lighttpd ]
then
invoke-rc.d lighttpd reload || true
fi
else
# Already disabled!
# Keep track of conf disabled by user
mkdir -p /etc/javascript-common
disabled_file_content  
%p/etc/javascript-common/lighttpd_disabled_by_user
fi
;;
upgrade)
if [ ! -L %p/etc/lighttpd/conf-enabled/90-javascript-alias.conf 
]
then
# Keep track of conf disabled by user
mkdir -p %p/etc/javascript-common
disabled_file_content  
%p/etc/javascript-common/lighttpd_disabled_by_user
fi
;;
failed-upgrade|deconfigure)
;;
*)
echo prerm called with unknown argument \`${1}' 2
exit 1
;;
esac


exit 0

###
Description: Base support for JavaScript library packages
DescDetail: 
Web applications that use JavaScript need to distribute it through HTTP. Using
a common path for every script avoids the need to enable this path in the HTTP
server for every package.
.
This is a helper package that creates %p/share/javascript and enables it in
the Apache and Lighttpd webserver.:

###
License: GPL
Homepage: http://packages.qa.debian.org/j/javascript-common.html
Maintainer: Justin F. Hallett the...@users.sourceforge.net


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk___

[cvs] experimental/thesin/finkinfo javascript-common.info,1.1,1.2

2013-08-13 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22640

Modified Files:
javascript-common.info 
Log Message:
Add comments to the comment

Index: javascript-common.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/javascript-common.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- javascript-common.info  13 Aug 2013 21:15:23 -  1.1
+++ javascript-common.info  13 Aug 2013 21:16:25 -  1.2
@@ -19,6 +19,7 @@
 
 CompileScript: echo
 InstallScript: 
+### Requires Root or chroot
 #dh install --with apache2
 
 install -d -m755 %i/share/javascript


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo apache2.info, NONE, 1.1 apache2.patch, NONE, 1.1 debhelper.info, NONE, 1.1 php5-adodb.info, 1.2, 1.3 php5-xdebug.info, 1.2, 1.3 php5.info, 1.15, 1.16 php5.patch, 1.1

2013-08-13 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26745

Modified Files:
php5-adodb.info php5-xdebug.info php5.info php5.patch 
Added Files:
apache2.info apache2.patch debhelper.info 
Log Message:
 * Add debhelper
 * Update apache2 to 2.4.x
 * Update php5 to 5.5.x
 * Update php5 modules to work with the new php5


--- NEW FILE: apache2.info ---
Package: apache2
Version: 2.4.6
Revision: 2.1
###
Provides: httpd
BuildDepends: 
dpkg-dev (= 1.16.1),
fink (= 0.32),
libaprutil.0-dev (= 1.5.2),
libapr.0-dev,
libpcap1,
libpcre1,
pkgconfig,
openssl,
openssl100-dev,
openldap24-dev

Depends: 
mime-support,
[...1751 lines suppressed...]
echo postrm called with unknown argument \`$1' 2
exit 1
;;
esac

exit 0

###
Description: Apache HTTP Server
DescDetail: 
The Apache Software Foundation's goal is to build a secure, efficient and
extensible HTTP server as standards-compliant open source software. The
result has long been the number one web server on the Internet.
.
This package contains the configuration files, init scripts and support
scripts. It does not install the actual apache2 binaries.

License: BSD
Homepage: http://www.apache.org
Maintainer: Justin F. Hallett the...@users.sourceforge.net

Index: php5-xdebug.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5-xdebug.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php5-xdebug.info23 Aug 2012 16:00:44 -  1.2
+++ php5-xdebug.info13 Aug 2013 22:10:46 -  1.3
@@ -1,31 +1,132 @@
 Package: php5-xdebug
-Version: 2.2.1
-Revision: 1
+Version: 2.2.3
+Revision: 1.1
 ###
-BuildDepends: php5-dev, libtool2
-Depends: phpapi-20100525
+BuildDepends: 
+   debhelper (= 6),
+   php5-dev (= 5.1),
+   libtool2
+
+Depends: 
+   ucf,
+   phpapi-20121212
+
 ###
 Source: http://xdebug.org/files/xdebug-%v.tgz
-Source-MD5: 5e5c467e920240c20f165687d7ac3709
+Source-MD5: e49cec9861b45dc0b36eae33bf8a14fa
 ###
-ConfigureParams: --with-php-config=%p/bin/php-config5 --enable-xdebug 
--enable-shared --disable-static
+ConfigureParams: 
+--with-php-config=%p/bin/php-config5 \
+--enable-xdebug \
+--enable-shared \
+--disable-static
+
 CompileScript: 
 phpize5
 ./configure %c
 make
 
 InfoTest: 
-  TestScript: make test || exit 2
+   TestScript: 
+   make test || exit 2
+   
 
 InstallScript: 
 make INSTALL_ROOT=%d install
-install -d -m 0755 %i/etc/php5/conf.d/
-echo zend_extension=$(%p/bin/php-config5 --extension-dir)/xdebug.so  
%i/etc/php5/conf.d/xdebug.ini
+
+install -d -m755 %i/etc/php5/mods-available/
+echo zend_extension=$(%p/bin/php-config5 --extension-dir)/xdebug.so  
%i/etc/php5/mods-available/xdebug.ini
 
 ###
-ConfFiles: %p/etc/php5/conf.d/xdebug.ini
+ConfFiles: %p/etc/php5/mods-available/xdebug.ini
 DocFiles: CREDITS LICENSE NEWS README
 ###
+PreInstScript: 
+set -e
+
+dpkg-maintscript-helper mv_conffile %p/etc/php5/conf.d/xdebug.ini \
+   %p/etc/php5/mods-available/xdebug.ini 2.2.0-1~ -- $@
+
+case $1 in
+install|upgrade)
+;;
+
+abort-upgrade)
+;;
+
+*)
+echo preinst called with unknown argument \`$1' 2
+exit 1
+;;
+esac
+
+exit 0
+
+PostInstScript: 
+set -e
+
+dpkg-maintscript-helper mv_conffile %p/etc/php5/conf.d/xdebug.ini \
+   %p/etc/php5/mods-available/xdebug.ini 2.2.0-1~ -- $@
+
+# Verify path in ini file is correct
+EXT_DIR=$(%p/bin/php-config5 --extension-dir)
+if [ -n $EXT_DIR ]; then
+   sed -e s@\(zend_extension=\).*\(xdebug.so\)@\1$EXT_DIR/\2@g -i 
%p/etc/php5/mods-available/xdebug.ini
+fid -e s@\(zend_extension=\).*\(xdebug.so\)@\1$EXT_DIR/\2@g -i 
%p/etc/php5/mods-available/xdebug.ini.inir©3ʒ+6µKÿ7µKÿu*3ʒ+€J4ʒ+ETʒ+’8P˒+7µKÿ€Pr˒+ð+µKÿÀ*µKÿk@3ʒ+6
 
èè!è!6µKÿ7µKÿxôO˒+ð,µKÿ’3ʒ+†@3ʒ+6µKÿ`3ʒ+Ï6µKÿÀï³Ë’+u*3ʒ+à³Ë’+Øä³Ë’+¨é³Ë’+€J4ʒ+xôO˒+ð,µKÿÀ+µKÿk@3ʒ+à!à!6µKÿ7µKÿH¾/˒+Ð-µKÿ’3ʒ+†@3ʒ+6µKÿ`3ʒ+Ï6µKÿÀ6µKÿ¸6µKÿ8KTʒ+Œp˜7µKÿu*3ʒ+€J4ʒ+Ð-µKÿ
 
,µKÿk@3ʒ+GHIJKMNOP6µKÿ7µKÿHu˒+p/µKÿ’3ʒ+†@3ʒ+6µKÿ0ï³Ë’+u*3ʒ+P˒+
 ©ãʒ+à³Ë’+Øä³Ë’+¨é³Ë’+€J4ʒ+Hu˒+p/µKÿ
 
°-µKÿk@3ʒ+8u˒+p/µKÿà-µKÿk@3ʒ+(u˒+p/µKÿ.µKÿk@3ʒ+u˒+p/µKÿ@.µKÿk@3ʒ+
  
¨î³Ë’+u*3ʒ+¨é³Ë

[cvs] experimental/thesin/finkinfo php5.patch,1.11,1.12

2013-08-13 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30319

Modified Files:
php5.patch 
Log Message:
 * patch file got mangled, repair commit


Index: php5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- php5.patch  13 Aug 2013 22:10:46 -  1.11
+++ php5.patch  13 Aug 2013 23:04:16 -  1.12
@@ -1,1943 +1,7829 @@
-Info2: 
-Package: php5
-Version: 5.5.1
-Revision: 1.1
-Type: sapiver (20121212)
-###
-BuildDepends: 
-   fink (= 0.34.99.git),
-   dpkg-dev (= 1.16.1),
-   automake1.11,
-   apache2-dev,
[...9741 lines suppressed...]
++while ! nc -z 127.0.0.1 $port; do
++c=$(($c+1));
++sleep 3;
++if [ $c -gt 20 ]; then
++  echo Timed out waiting for mysql server to be available 2
++  if [ $pid ]; then
++  kill $pid || :
++  sleep 2
++  kill -s KILL $pid || :
++  fi
++  exit 1
++fi
++done
++
++# Check if the server is running
++$mysqladmin status
++# Drop the database if it exists
++$mysqladmin --force --silent drop test || true
++# Create new empty database
++$mysqladmin create test


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web libjs-jquery.info, 1.3, 1.4 libjs-jquery.patch, 1.1, NONE

2013-08-12 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17913

Modified Files:
libjs-jquery.info 
Removed Files:
libjs-jquery.patch 
Log Message:
  * Generating jquery minified from source again (Closes: #495178)
  * update source
  * use patches direct from debian instead of providing the smae one


--- libjs-jquery.patch DELETED ---

Index: libjs-jquery.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/libjs-jquery.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libjs-jquery.info   23 Aug 2012 16:23:01 -  1.3
+++ libjs-jquery.info   12 Aug 2013 15:39:15 -  1.4
@@ -1,20 +1,20 @@
 Package: libjs-jquery
 Version: 1.7.2
-Revision: 2
+Revision: 3
 ###
 BuildDepends: node-uglify
 Depends: javascript-common
 ###
-Source: mirror:debian:/pool/main/j/jquery/jquery_%v+debian.orig.tar.gz
-Source-MD5: cd39ef69e2b0e2c2e1fed17f3d91
-SourceDirectory: jquery_1.7.2+debian.orig
+Source: mirror:debian:/pool/main/j/jquery/jquery_%v+dfsg.orig.tar.gz
+Source-MD5: c75b2e33e0d769bedfea8f4e7ca45d4c
+SourceDirectory: jquery_%v+dfsg
+Source2: mirror:debian:/pool/main/j/jquery/jquery_%v+dfsg-2.debian.tar.gz
+Source2-MD5: 26395d7bdf4035059983afc8d80bd360
+Source2ExtractDir: jquery_%v+dfsg
 ###
-PatchFile: %n.patch
-PatchFile-MD5: 482008df524714d14ef3cfed3386cfe6
 PatchScript: 
-  sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
-
-  patch -p1  fink/patches/build.patch
+  patch -p1  debian/patches/build.patch
+  patch -p1  debian/patches/no-min.diff
 
 ###
 DocFiles: GPL-LICENSE.txt MIT-LICENSE.txt README.md
@@ -29,6 +29,7 @@
 # links
 ln -s %p/share/javascript/jquery/jquery.min.js 
%i/share/javascript/jquery/jquery.pack.js
 ln -s %p/share/javascript/jquery/jquery.min.js 
%i/share/javascript/jquery/jquery.lite.js
+ln -s %p/share/javascript/jquery/jquery.js 
%i/share/javascript/jquery/jquery.min.js
 
 ###
 Description: JS library for dynamic web applications


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/base debianutils.info, 1.14, 1.15

2013-08-10 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/base
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24433

Modified Files:
debianutils.info 
Log Message:
New upstream release, remove old C/R that are no longer valid or required since 
mktemp and sure are no longer provided.

Index: debianutils.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/base/debianutils.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- debianutils.info28 Nov 2012 15:08:52 -  1.14
+++ debianutils.info11 Aug 2013 02:34:18 -  1.15
@@ -1,15 +1,13 @@
 Package: debianutils
-Version: 4.3.2
-Revision: 2
+Version: 4.4
+Revision: 1
 Essential: true
 Maintainer: Fink Core Group fink-c...@lists.sourceforge.net
 ## Remove po4a
 BuildDepends: fink (= 0.24.12-1)
 Depends: base-files, sensible-utils
-Conflicts: mktemp, ftpfiles ( 20030406-1)
-Replaces: mktemp, tetex, ftpfiles ( 20030406-1)
 Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 6270998707ed0d0894b981e2e9dbb912
+Source-MD5: c0cb076754d7f4eb1e3397d00916647f
 SourceDirectory: %n-%v
 PatchScript: 
 ### fix use of chown/mod --reference which isn't supported in /bin/chown/mod


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web javascript-common.info, 1.1, 1.2

2013-08-08 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31476

Modified Files:
javascript-common.info 
Log Message:
Update for upcoming apache 2.4

Index: javascript-common.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/web/javascript-common.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- javascript-common.info  4 Jul 2012 20:56:48 -   1.1
+++ javascript-common.info  8 Aug 2013 15:07:43 -   1.2
@@ -1,6 +1,6 @@
 Package: javascript-common
 Version: 7
-Revision: 1
+Revision: 2
 ###
 Suggests: apache2
 ###
@@ -28,6 +28,7 @@
 
 case ${1} in
configure)
+   ### Apache 2.2
mkdir -p %p/etc/apache2/conf.d
 
if [ ! -e %p/etc/apache2/conf.d/javascript-common.conf ]
@@ -35,6 +36,18 @@
ln -s %p/etc/javascript-common/javascript-common.conf 
%p/etc/apache2/conf.d/javascript-common.conf
fi
 
+   ### Apache 2.4
+   mkdir -p %p/etc/apache2/conf-available
+
+   if [ ! -e %p/etc/apache2/conf-available/javascript-common.conf ]
+   then
+   ln -s %p/etc/javascript-common/javascript-common.conf 
%p/etc/apache2/conf-available/javascript-common.conf
+   if which a2enconf /dev/null 21
+   then
+   a2enconf javascript-common
+   fi
+   fi
+
if which apache2ctl /dev/null 21
then
apache2ctl restart
@@ -57,11 +70,22 @@
 PostRmScript: 
 set -e
 
+### Apache 2.2
 if [ -L %p/etc/apache2/conf.d/javascript-common.conf ]
 then
rm -f %p/etc/apache2/conf.d/javascript-common.conf
 fi
 
+### Apache 2.4
+if [ -L %p/etc/apache2/conf-available/javascript-common.conf ]
+then
+   if which a2disconf /dev/null 21
+   then
+   a2disconf javascript-common
+   fi
+   rm -f %p/etc/apache2/conf-available/javascript-common.conf
+fi
+
 if which apache2ctl /dev/null 21
 then
apache2ctl restart


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info,1.14,1.15

2013-08-08 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31800

Modified Files:
php5.info 
Log Message:
Update php5 again in hopes it'll work better with apache2.4, it MUST be 
recompiled against 2.4 so I'm not sure this will help at all sadly

Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- php5.info   7 Aug 2013 23:21:32 -   1.14
+++ php5.info   8 Aug 2013 15:09:18 -   1.15
@@ -4,7 +4,7 @@
 Revision: 15.2
 Type: sapiver (20100525)
 ###
-BuildDepends: fink (= 0.34.99.git), automake1.11, apache2-prefork-dev | 
apache2-dev, aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, 
expat1, file-dev, freetds (= 1:0.91-1), freetds-dev, freetype219, gd2, 
glib2-dev, gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, 
libgcrypt, libicu36-dev, libjpeg9, libmcrypt, libmhash2, libonig2-dev, 
libodbc3-dev, libpcre1, libpng16, libtidy-0.99.0-dev, libtool2, libxml2 ( 
2.9.0), libxslt, mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, 
netcat, openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, 
recode-dev, sed, sqlite3-dev, wrap
+BuildDepends: fink (= 0.34.99.git), automake1.11, apache2-prefork-dev | 
apache2-dev (= 2.4.6), aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, 
enchant1-dev, expat1, file-dev, freetds (= 1:0.91-1), freetds-dev, 
freetype219, gd2, glib2-dev, gmp5, libapr.0-dev, libc-client1-dev, libcurl4, 
libevent2, libgcrypt, libicu36-dev, libjpeg9, libmcrypt, libmhash2, 
libonig2-dev, libodbc3-dev, libpcre1, libpng16, libtidy-0.99.0-dev, libtool2, 
libxml2 ( 2.9.0), libxslt, mysql-unified-dev | libmysqlclient18-dev, 
libnetsnmp30-dev, netcat, openldap24-dev, openssl100-dev, postgresql91-dev, 
qdbm14, re2c, recode-dev, sed, sqlite3-dev, wrap
 Depends: libapache2-mod-php5 (= %v-%r) | libapache2-mod-php5filter (= %v-%r) | 
php5-cgi (= %v-%r) | php5-fpm (= %v-%r), php5-common (= %v-%r)
 ###
 CustomMirror: 
@@ -194,7 +194,7 @@
 CompileScript: 
 #!/bin/sh -ex
 
-apache2_CONFARGS=--prefix=%p --with-apxs2=%p/sbin/apxs2 \
+apache2_CONFARGS=--prefix=%p --with-apxs2=%p/bin/apxs2 \
--with-config-file-path=%p/etc/php5/apache2 \
--with-config-file-scan-dir=%p/etc/php5/apache2/conf.d \
%c \
@@ -235,7 +235,7 @@
--with-pdo-sqlite=shared,%p \
--with-pdo-dblib=shared,%p;
 
-apache2filter_CONFARGS=--prefix=%p --with-apxs2filter=%p/sbin/apxs2 \
+apache2filter_CONFARGS=--prefix=%p --with-apxs2filter=%p/bin/apxs2 \
--with-config-file-path=%p/etc/php5/apache2filter \
--with-config-file-scan-dir=%p/etc/php5/apache2filter/conf.d \
%c \
@@ -392,7 +392,7 @@
 #!/bin/sh -ex
 
 # install apache2 DSO module
-APACHE_MOD_DIR=%d`%p/sbin/apxs2 -q LIBEXECDIR`;
+APACHE_MOD_DIR=%d`%p/bin/apxs2 -q LIBEXECDIR`;
 mkdir -p ${APACHE_MOD_DIR};
 cp %b/apache2-build/libs/libphp5.so ${APACHE_MOD_DIR}/libphp5.so;
 mkdir -p %i/etc/apache2/mods-available;


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo ucf.info,1.12,1.13

2013-08-07 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24852

Modified Files:
ucf.info 
Log Message:
Fix readlink in ucfr

Index: ucf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/ucf.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ucf.info12 Jul 2013 14:52:44 -  1.12
+++ ucf.info7 Aug 2013 23:18:55 -   1.13
@@ -18,7 +18,7 @@
 SourceDirectory: %n-%v
 ###
 PatchScript: 
-perl -pi -e 's,readlink,greadlink,g' ucf
+perl -pi -e 's,readlink,greadlink,g' ucf ucfr
 perl -pi -e 's,/usr,%p,g' examples/postinst examples/postrm lcf lcf.1 ucf 
ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1
 # except perl, keep that one using /usr
 perl -pi -e 's,%p/bin/perl,/usr/bin/perl,g' examples/postinst examples/postrm 
lcf lcf.1 ucf ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1


--
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with 2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info, 1.13, 1.14 php5.patch, 1.9, 1.10

2013-08-07 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24968

Modified Files:
php5.info php5.patch 
Log Message:
Update deps for libjpeg and libpng, update to libxml2 2.9.0+ New ABI Patch, 
update for new upcoming apache 2.4.x

Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- php5.info   23 May 2013 17:59:06 -  1.13
+++ php5.info   7 Aug 2013 23:21:32 -   1.14
@@ -1,10 +1,10 @@
 Info2: 
 Package: php5
 Version: 5.4.4
-Revision: 15.1
+Revision: 15.2
 Type: sapiver (20100525)
 ###
-BuildDepends: fink (= 0.34.99.git), automake1.11, apache2-prefork-dev, 
aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, expat1, 
file-dev, freetds (= 1:0.91-1), freetds-dev, freetype219, gd2, glib2-dev, 
gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, libgcrypt, 
libicu36-dev, libjpeg8, libmcrypt, libmhash2, libonig2-dev, libodbc3-dev, 
libpcre1, libpng15, libtidy-0.99.0-dev, libtool2, libxml2, libxslt, 
mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, netcat, 
openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, recode-dev, 
sed, sqlite3-dev, wrap
+BuildDepends: fink (= 0.34.99.git), automake1.11, apache2-prefork-dev | 
apache2-dev, aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, 
expat1, file-dev, freetds (= 1:0.91-1), freetds-dev, freetype219, gd2, 
glib2-dev, gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, 
libgcrypt, libicu36-dev, libjpeg9, libmcrypt, libmhash2, libonig2-dev, 
libodbc3-dev, libpcre1, libpng16, libtidy-0.99.0-dev, libtool2, libxml2 ( 
2.9.0), libxslt, mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, 
netcat, openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, 
recode-dev, sed, sqlite3-dev, wrap
 Depends: libapache2-mod-php5 (= %v-%r) | libapache2-mod-php5filter (= %v-%r) | 
php5-cgi (= %v-%r) | php5-fpm (= %v-%r), php5-common (= %v-%r)
 ###
 CustomMirror: 
@@ -69,7 +69,7 @@
 Source: mirror:custom:distributions/php-%v.tar.gz
 Source-MD5: 8366c3626f2275ab8c7ef5e2d6bc5bd7
 PatchFile: %n.patch
-PatchFile-MD5: 450807d4fa22c773daff254dbfd4656e
+PatchFile-MD5: 798409a461203126e261cbe443827f71
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -144,6 +144,7 @@
   patch -p1  fink/patches/giconv_is_inferior.patch
   patch -p1  fink/patches/gd-libJPEG-Version.patch
   patch -p1  fink/patches/php-5.2.4-embed-darwin.patch
+  patch -p1  fink/patches/libxml2_ABIfix.patch
 
 UseMaxBuildJobs: false
 ###
@@ -850,7 +851,7 @@
 
 SplitOff22: 
   Package: %N-gd
-  Depends: dpkg (= 1.15), ucf, phpapi-%type_raw[sapiver], %N-common (= 
%v-%r), freetype219-shlibs, gd2-shlibs, libjpeg8-shlibs, libpng15-shlibs
+  Depends: dpkg (= 1.15), ucf, phpapi-%type_raw[sapiver], %N-common (= 
%v-%r), freetype219-shlibs, gd2-shlibs, libjpeg9-shlibs, libpng16-shlibs
   Files: 
 share/php5/gd
 lib/php5/%type_raw[sapiver]/gd.so
@@ -2661,7 +2662,7 @@
 SplitOff80: 
   Package: libapache2-mod-%N
   Provides: phpapi-%type_raw[sapiver]
-  Depends: dpkg (= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork, 
apache2.2-common, bzip2-shlibs, db53-aes-shlibs, libapr.0-shlibs, 
libaprutil.0-shlibs, libgettext8-shlibs, libiconv, libonig2-shlibs, 
libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, qdbm14-shlibs
+  Depends: dpkg (= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork | 
apache2, apache2.2-common | apache2, bzip2-shlibs, db53-aes-shlibs, 
libapr.0-shlibs, libaprutil.0-shlibs, libgettext8-shlibs, libiconv, 
libonig2-shlibs, libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, 
qdbm14-shlibs
   Conflicts: libapache2-mod-%Nfilter
   Replaces: libapache2-mod-%Nfilter
   ConfFiles: 
@@ -2769,7 +2770,7 @@
 SplitOff81: 
   Package: libapache2-mod-%Nfilter
   Provides: phpapi-%type_raw[sapiver]
-  Depends: dpkg (= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork, 
apache2.2-common, bzip2-shlibs, db53-aes-shlibs, libapr.0-shlibs, 
libaprutil.0-shlibs, libgettext8-shlibs, libiconv, libonig2-shlibs, 
libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, qdbm14-shlibs
+  Depends: dpkg (= 1.15), ucf, %N-common (= %v-%r), apache2-mpm-prefork | 
apache2, apache2.2-common | apache2, bzip2-shlibs, db53-aes-shlibs, 
libapr.0-shlibs, libaprutil.0-shlibs, libgettext8-shlibs, libiconv, 
libonig2-shlibs, libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, 
qdbm14-shlibs
   Conflicts: libapache2-mod-%N
   Replaces: libapache2-mod-%N
   ConfFiles: 

Index: php5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- php5.patch  6 May 2013 17:52:07 -   1.9
+++ php5.patch  7 Aug 2013 23:21:32 -   1.10
@@ 

[cvs] experimental/thesin/finkinfo ucf.info,1.11,1.12

2013-07-12 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28379

Modified Files:
ucf.info 
Log Message:
New upstream

Index: ucf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/ucf.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ucf.info29 May 2013 15:03:21 -  1.11
+++ ucf.info12 Jul 2013 14:52:44 -  1.12
@@ -1,5 +1,5 @@
 Package: ucf
-Version: 3.0027
+Version: 3.0027+nmu1
 Revision: 1
 ###
 BuildDepends: 
@@ -14,7 +14,7 @@
 
 ###
 Source: mirror:debian:pool/main/u/%n/%n_%v.tar.gz
-Source-MD5: c27e52f52cace7294de6416249381d9c
+Source-MD5: e6a556d656ecbccf224e1825b15115c2
 SourceDirectory: %n-%v
 ###
 PatchScript: 


--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[fink/fink] b057f2: More complete status output for --apt, future apt ...

2013-06-24 Thread Justin F. Hallett
  Branch: refs/heads/master
  Home:   https://github.com/fink/fink
  Commit: b057f237ffba3eea7a2f712b0bedad0e3d46e440
  
https://github.com/fink/fink/commit/b057f237ffba3eea7a2f712b0bedad0e3d46e440
  Author: Justin F. Hallett the...@users.sf.net
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
M fink-virtual-pkgs.in

  Log Message:
  ---
  More complete status output for --apt, future apt will require more field 
completness



--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] experimental/thesin/finkinfo dpkg.info, 1.44, 1.45 dpkg.patch, 1.19, 1.20

2013-06-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25458

Modified Files:
dpkg.info dpkg.patch 
Log Message:
Enabled buildflags.conf, fix so that --disable-nls will build, and added 
hardening flags thanks to gecko2

Index: dpkg.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dpkg.patch  28 May 2013 14:34:15 -  1.19
+++ dpkg.patch  23 Jun 2013 14:17:33 -  1.20
@@ -1,3 +1,37 @@
+diff -ruN dpkg-1.16.10.orig/fink/buildflags.conf 
dpkg-1.16.10/fink/buildflags.conf
+--- dpkg-1.16.10.orig/fink/buildflags.conf 1969-12-31 17:00:00.0 
-0700
 dpkg-1.16.10/fink/buildflags.conf  2013-06-22 20:26:06.0 -0600
+@@ -0,0 +1,30 @@
++# defaults
++APPEND CFLAGS -g -O2
++APPEND CXXFLAGS -g -O2
++APPEND FFLAGS -g -O2
++
++# debian stackprotector
++APPEND CFLAGS -fstack-protector 
++APPEND CXXFLAGS -fstack-protector 
++
++# debian pie
++APPEND CFLAGS -fPIE
++APPEND CXXFLAGS -fPIE
++APPEND LDFLAGS -fPIE -Wl,-pie
++
++# debian relro
++APPEND LDFLAGS -Wl,-read_only_stubs
++
++# debian bindnow
++APPEND LDFLAGS -Wl,-bind_at_load
++
++# debian fortify
++APPEND CPPFLAGS -D_FORTIFY_SOURCE=2
++
++# debian format
++PREPEND CFLAGS -Wformat -Werror=format-security
++PREPEND CXXFLAGS -Wformat -Werror=format-security
++
++# fink defaults
++PREPEND CPPFLAGS -I@FINKPREFIX@/include
++PREPEND LDFLAGS -L@FINKPREFIX@/lib
 diff -ruN dpkg-1.16.10.orig/fink/md5sum dpkg-1.16.10/fink/md5sum
 --- dpkg-1.16.10.orig/fink/md5sum  1969-12-31 17:00:00.0 -0700
 +++ dpkg-1.16.10/fink/md5sum   2013-05-28 08:30:00.0 -0600

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- dpkg.info   23 Jun 2013 01:56:20 -  1.44
+++ dpkg.info   23 Jun 2013 14:17:33 -  1.45
@@ -36,7 +36,7 @@
 Source-MD5: a20a06a5272717274a8b009368f237da
 
 PatchFile: dpkg.patch
-PatchFile-MD5: 30d353628371c0eb464812cf25384122
+PatchFile-MD5: a851cfe5976cffc3efe6c044d1c88578
 
 PatchScript: 
 sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -82,6 +82,9 @@
 # Fix for gnutar
 perl -pi -e 's,\tar\,\%p/bin/gnutar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c
 
+# Fix for --disable-nls
+perl -pi -e 's,defined\(__GNUG__\),defined(__NOTGNUG__),g' lib/compat/gettext.h
+
 # Fix for older gcc ie: 10.5
 perl -pi -e 's,-Wvla ,,g' configure
 
@@ -91,13 +94,14 @@
 perl -pi -e 's,localedir = \@localedir\@,localedir = \@localedir\@-perl,g' 
scripts/Makefile.in scripts/po/Makefile.in.in
 
 
-SetCFLAGS: -I%p/include -F/System/Library/Frameworks/CoreFoundation.framework 
-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers 
-Wno-cast-align -Wno-format-security
-SetLDFLAGS: -framework CoreFoundation
+SetCFLAGS: -g -O2 -fstack-protector -Wformat -fPIE 
-F/System/Library/Frameworks/CoreFoundation.framework -Wno-unused-parameter 
-Wno-missing-field-initializers -Wno-cast-align -Wno-format-security 
-Wno-deprecated-writable-strings
+SetCPPFLAGS: -D_FORTIFY_SOURCE=2
+SetCXXFLAGS: -g -O2 -fstack-protector -Wformat -fPIE
+SetLDFLAGS: -Wl,-read_only_stubs -Wl,-bind_at_load -fPIE -Wl,-pie -framework 
CoreFoundation
 
 ### Uncomment --disable-dselect for bootstrap version, don't make dselect
 #  --disable-dselect \
 ConfigureParams: 
-  --disable-nls \
   --disable-start-stop-daemon \
   --with-admindir=%p/var/lib/dpkg \
   --mandir=%p/share/man \
@@ -109,6 +113,7 @@
   --with-bz2 \
   --srcdir=%b \
   --build=%m-apple-darwin \
+  --disable-linker-optimisations \
   PERL_LIBDIR=%p/lib/perl5 \
   PERL=/usr/bin/perl
 
@@ -130,6 +135,7 @@
   ## currently in fink
   # install -c -p -m 644 debian/shlibs.default %i/etc/dpkg
   install -c -p -m 644 debian/shlibs.override %i/etc/dpkg
+  install -c -p -m 644 fink/buildflags.conf %i/etc/dpkg/
   rm -rf %i/lib/dpkg/methods/*
 
   install -m 0755 fink/md5sum %i/bin
@@ -686,9 +692,13 @@
   Essential: yes
   ### Currently in fink
   # ConfFiles: %p/etc/dpkg/shlibs.default %p/etc/dpkg/shlibs.override
-  ConfFiles: %p/etc/dpkg/shlibs.override
+  ConfFiles: 
+%p/etc/dpkg/shlibs.override
+%p/etc/dpkg/buildflags.conf
+  
   Files: 
 etc/dpkg/shlibs.override
+etc/dpkg/buildflags.conf
 bin/dpkg-architecture
 bin/dpkg-buildflags
 bin/dpkg-buildpackage


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo jetring.info,1.1,1.2

2013-06-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv755

Modified Files:
jetring.info 
Log Message:
Make sure we use the binarys from the pkg

Index: jetring.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/jetring.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jetring.info18 Jun 2013 21:50:53 -  1.1
+++ jetring.info23 Jun 2013 18:43:39 -  1.2
@@ -23,6 +23,7 @@
   perl -pi -e 's,\$type\.,g\.\$type\.,g' jetring-checksum
   perl -pi -e 's,gpg,gpg2,g' jetring-accept jetring-apply jetring-build 
jetring-diff jetring-explode jetring-gen jetring-review jetring-signindex 
   perl -pi -e 's,\.gpg2,\.gpg,g' jetring-accept jetring-apply jetring-build 
jetring-diff jetring-explode jetring-gen jetring-review jetring-signindex 
+  perl -pi -e 's,jetring-build,\.\.\/jetring-build,g' example/Makefile
 
 
 CompileScript: 


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo/future - New directory

2013-06-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo/future
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv769/future

Log Message:
Directory /cvsroot/fink/experimental/thesin/finkinfo/future added to the 
repository



--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo/future gnupg2.info, NONE, 1.1 libcurl4.info, NONE, 1.1 system-openssl-dev-0.9.8.info, NONE, 1.1

2013-06-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo/future
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv818

Added Files:
gnupg2.info libcurl4.info system-openssl-dev-0.9.8.info 
Log Message:
futureos modifications

--- NEW FILE: gnupg2.info ---
Package: gnupg2
Version: 2.0.18
Revision: 3.1
Description: Gnu privacy guard - A Free PGP replacement
License: GPL
BuildDepends: 
  texinfo (= 4.1-3), libgettext8-dev, libiconv-dev, bzip2-dev,
  openldap24-dev, readline6, libgpg-error (= 1.8-1), libgcrypt (= 1.2.0-1),
  libassuan2, libksba8 (= 1.2.0-1), pth2-dev, libcurl4, libssh2.1,
  system-openssl-dev, adns-1.4-dev, fink-package-precedence

Depends: 
  bzip2-shlibs, libgettext8-shlibs, libiconv,
  openldap24-shlibs, readline6-shlibs, libgpg-error-shlibs,
  libgcrypt-shlibs (= 1.2.0-1), libksba8-shlibs (= 1.2.0-1),
  libassuan2-shlibs, pth2-shlibs, libcurl4-shlibs, adns-1.4-shlibs

Conflicts: gpg-agent (= 1.9.20-1)
Replaces: gpg-agent (= 1.9.20-1)
Source: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%v.tar.bz2
Source-MD5: 2f37e0722666a0fedbe4d9f9227ac4d7
Source2: mirror:sourceforge:fink/gnupg-docs-20021001.tar.gz
Source2-MD5: 5e34b5be84adc6a898e164b99fce45d8
Source2ExtractDir: gnupg-%v
# glib fails to find the right stdint.h  It picks clang's internal one rather
# than the system header. Use same fix as macports of passing configure
#  gl_cv_absolute_stdint_h=/usr/include/stdint.h.
ConfigureParams: CPPFLAGS=-I%p/lib/system-openssl/include $CPPFLAGS 
LDFLAGS=-L%p/lib/system-openssl/lib $LDFLAGS --libexecdir='${prefix}/lib' 
--with-libiconv-prefix=%p --enable-dependency-tracking
CompileScript: 
if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2`  10.8 ]; 
then \

stdint_h=/Library/Developer/CommandLineTools/SDKs/MacOSX10.9.sdk/usr/include/stdint.h;
 \
else \
stdint_h=/usr/include/stdint.h; \
fi; \
gl_cv_absolute_stdint_h=$stdint_h %{default_script}
fink-package-precedence .

InstallScript: 
make install DESTDIR=%d

mkdir -p %i/share/doc/%n/documentation
mv gnupg-docs/* %i/share/doc/%n/documentation
mv %i/share/doc/gnupg/* %i/share/doc/gnupg2
rmdir %i/share/doc/gnupg

DocFiles: AUTHORS COPYING ChangeLog README TODO THANKS
InfoDocs: gnupg.info
DescDetail: 
GnuPG is GNU's tool for secure communication and data
storage. It can be used to encrypt data and to create digital
signatures. It includes an advanced key management facility and is
compliant with the proposed OpenPGP Internet standard as described in
RFC2440.
GnuPG does not use use any patented algorithms so it cannot be
compatible with PGP2 because it uses IDEA (which is patented
worldwide) and RSA. RSA's patent expired on the 20th September 2000,
and it is now included in GnuPG. 

DescUsage: 
To create an initial key pair run 'gpg2 --gen-key'
Consult the manual for a good intro: 
%p/share/doc/%n/documentation/handbook/

DescPackaging: 
Specifically looks for pth (%p/bin/pth-config)

Homepage: http://www.gnupg.org
Maintainer: Brendan Cully f...@brendan.cully.org

--- NEW FILE: libcurl4.info ---
Info4: 
Package: libcurl4
Version: 7.31.0
Revision: 1.1
Description: Lib. for transferring files with URL syntax
DescDetail: 
curl is a command line tool for transferring files with URL syntax,
supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP,
LDAPS and FILE. curl supports SSL certificates, HTTP POST, HTTP PUT,
FTP uploading, HTTP form based upload, proxies, cookies, user+password
authentication (Basic, Digest, NTLM, Negotiate, kerberos...), file
transfer resume, proxy tunneling and a busload of other useful tricks.

DescPackaging: 
  Now use System's OpenSSL.
  
  No longer need --mandir. Private symbols now hidden with gcc 4.
  Depend on pkgconfig = 0.20-1
  per http://wiki.finkproject.org/index.php/Fink:Packaging:pkg-config
  
  Removed -I/usr/include -L/usr/lib from krb5-config.
  
  No longer build static libs.
  
  Packages depending on libcurl4 no longer need to depend on its dependencies,
  just Depend on libcurl4-shlibs and BuildDepend on libcurl4.
  
  Add -dead_strip_dylibs to LDFLAGS on =10.5 to not link indirect libs.
  
  7.19.4 fixes an arbitrary file access vulnerability described at:
  http://curl.haxx.se/docs/adv_20090303.html
  
  7.21.7 fixes inappropriate GSSAPI delegation described at
  http://curl.haxx.se/docs/adv_20110623.html
  
  Versions of curl before 7.11.1-11 were maintained by Max Horn.

Maintainer: Daniel Johnson dan...@daniel-johnson.org
Homepage: http://curl.haxx.se/
License: BSD

Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
Source-MD5: b7bea20579ac2f696338ae03f2c19ba5

Depends: %N-shlibs (= %v-%r), pkgconfig (= 0.20-1)
BuildDepends: 
fink (= 0.26.2),
fink-package-precedence,
libmetalink3,
librtmp (= 2.3-1),
libssh2.1 (= 1.2.7-1),

[cvs] experimental/thesin/finkinfo dpkg.info,1.45,1.46

2013-06-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18543

Modified Files:
dpkg.info 
Log Message:
Few more changes that allow future to work

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- dpkg.info   23 Jun 2013 14:17:33 -  1.45
+++ dpkg.info   24 Jun 2013 03:00:55 -  1.46
@@ -76,11 +76,19 @@
 # Fink uses x86_64 instead of amd64
 perl -pi -e 's,amd64,x86_64,g' *table debian/archtable scripts/Makefile.in 
scripts/Makefile.am scripts/t/200_Dpkg_Shlibs/basictags.c 
scripts/t/200_Dpkg_Shlibs/basictags.symbols 
scripts/t/200_Dpkg_Shlibs/objdump.basictags-x86_64 scripts/t/200_Dpkg_Shlibs.t
 
-# Fix for gnutar (Slightly modified for bootstrap version)
-#perl -pi -e 's,\tar\,\/usr/bin/gnutar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c
-#perl -pi -e 's,--warning=no-timestamp,--format=gnu,g' dpkg-deb/extract.c
-# Fix for gnutar
-perl -pi -e 's,\tar\,\%p/bin/gnutar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c
+# Fix for tar (Slightly modified for dpkg-bootstrap)
+if [ %n = dpkg-bootstrap ]; then \
+  if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2`  10.8 ]; then \
+perl -pi -e 's,\tar\,\/usr/bin/tar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
+perl -pi -e 's,--warning=no-timestamp,-v,g' dpkg-deb/extract.c; \
+perl -pi -e 's,--format=gnu,--format=ustar,g' dpkg-deb/build.c; \
+  else \
+perl -pi -e 's,\tar\,\/usr/bin/gnutar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
+perl -pi -e 's,--warning=no-timestamp,--format=gnu,g' dpkg-deb/extract.c; \
+  fi \
+else \
+  perl -pi -e 's,\tar\,\%p/bin/gnutar\,g' dpkg-deb/build.c 
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
+fi
 
 # Fix for --disable-nls
 perl -pi -e 's,defined\(__GNUG__\),defined(__NOTGNUG__),g' lib/compat/gettext.h
@@ -135,7 +143,7 @@
   ## currently in fink
   # install -c -p -m 644 debian/shlibs.default %i/etc/dpkg
   install -c -p -m 644 debian/shlibs.override %i/etc/dpkg
-  install -c -p -m 644 fink/buildflags.conf %i/etc/dpkg/
+  install -c -p -m 644 fink/buildflags.conf %i/etc/dpkg
   rm -rf %i/lib/dpkg/methods/*
 
   install -m 0755 fink/md5sum %i/bin


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.43,1.44

2013-06-22 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12931

Modified Files:
dpkg.info 
Log Message:
Fox to future issues

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- dpkg.info   28 May 2013 14:34:15 -  1.43
+++ dpkg.info   23 Jun 2013 01:56:20 -  1.44
@@ -97,6 +97,7 @@
 ### Uncomment --disable-dselect for bootstrap version, don't make dselect
 #  --disable-dselect \
 ConfigureParams: 
+  --disable-nls \
   --disable-start-stop-daemon \
   --with-admindir=%p/var/lib/dpkg \
   --mandir=%p/share/man \


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/database freetds.info,1.5,1.6

2013-06-22 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/database
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16219

Modified Files:
freetds.info 
Log Message:
Correct double field

Index: freetds.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/database/freetds.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freetds.info16 Jun 2013 00:59:11 -  1.5
+++ freetds.info23 Jun 2013 03:47:41 -  1.6
@@ -163,5 +163,5 @@
 
 ###
 License: GPL
-Homepage: Homepage: http://www.freetds.org/
+Homepage: http://www.freetds.org/
 Maintainer: Justin F. Hallett the...@users.sourceforge.net


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web libjs-jquery-mobile.info, 1.3, 1.4

2013-06-20 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6294

Modified Files:
libjs-jquery-mobile.info 
Log Message:
New version

Index: libjs-jquery-mobile.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/web/libjs-jquery-mobile.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libjs-jquery-mobile.info23 Aug 2012 16:23:01 -  1.3
+++ libjs-jquery-mobile.info20 Jun 2013 22:39:11 -  1.4
@@ -1,12 +1,12 @@
 Package: libjs-jquery-mobile
-Version: 1.1.0
-Revision: 1
+Version: 1.2.0
+Revision: 2.1
 ###
 BuildDepends: yui-compressor
 Depends: javascript-common, libjs-jquery (= 1.7.1)
 ###
-Source: mirror:debian:/pool/main/j/jquery-mobile/jquery-mobile_%v.orig.tar.gz
-Source-MD5: 337c218c50196894333cedfc43de1c7c
+Source: 
mirror:debian:/pool/main/j/jquery-mobile/jquery-mobile_%v+dfsg.orig.tar.gz
+Source-MD5: 429a922fdb6e6585ba87e21e06b2af89
 SourceDirectory: jquery-mobile-%v
 ###
 CompileScript: 
@@ -16,6 +16,16 @@
 for file in `ls *.css`; do \
yui-compressor $file -o ${file%%.css}.min.css; \
 done
+ln -s $(basename jquery.mobile-*.js) jquery-mobile.js
+ln -s $(basename jquery.mobile-*.min.js) jquery-mobile.min.js
+ln -s $(basename jquery.mobile-*.css) jquery.mobile.css
+ln -s $(basename jquery.mobile-*.js) jquery.mobile.js
+ln -s $(basename jquery.mobile-*.min.js) jquery.mobile.min.js
+ln -s $(basename jquery.mobile-*.min.css) jquery.mobile.min.css
+ln -s $(basename jquery.mobile.structure-*.css) jquery.mobile.structure.css
+ln -s $(basename jquery.mobile.structure-*.min.css) 
jquery.mobile.structure.min.css
+ln -s $(basename jquery.mobile.theme-*.css) jquery.mobile.theme.css
+ln -s $(basename jquery.mobile.theme-*.min.css) jquery.mobile.theme.min.css
 
 InstallScript: 
 install -d -m0755 %i/share/javascript/jquery-mobile/images
@@ -25,13 +35,13 @@
 install -m0644 %b/images/*.png %i/share/javascript/jquery-mobile/images
 
 install -d -m0755 %i/share/doc/%N-docs
-cp -R %b/demos %i/share/doc/%N-docs/demos
+cp -R %b/demos %i/share/doc/%N-docs
 install -d -m0755 %i/share/doc/%N-docs/demos/js
 
 # links
 ln -s %p/share/javascript/jquery/jquery.min.js 
%i/share/doc/%N-docs/demos/js/jquery.js
-ln -s %p/share/javascript/jquery-mobile/jquery.mobile.js 
%i/share/doc/libjs-jquery-mobile-docs/demos/js/jquery.mobile.js
-ln -s %p/share/javascript/jquery-mobile/jquery.mobile.min.js 
%i/share/doc/libjs-jquery-mobile-docs/demos/js/jquery.mobile.min.js
+ln -s %p/share/javascript/jquery-mobile/jquery.mobile.js 
%i/share/doc/%N-docs/demos/js/jquery.mobile.js
+ln -s %p/share/javascript/jquery-mobile/jquery.mobile.min.js 
%i/share/doc/%N-docs/demos/js/jquery.mobile.min.js
 
 ###
 Description: Touch-Optimized for Smartphones  Tablets
@@ -78,7 +88,7 @@
   Package: %N-docs
   Depends: %N, libjs-jquery (= 1.7.1)
   Files: 
-share/doc/%n
+share/doc/%N-docs
   
   Description: Documentation for jQuery Mobile
 


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo apt.info, 1.2, 1.3 apt.patch, 1.1, 1.2

2013-06-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6393

Modified Files:
apt.info apt.patch 
Log Message:
Starting to add f-v-p to apt, builds, and runs, finds and runs f-v-p but it's 
not storing it into the pkgcache.bin yet, WIP

Index: apt.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.patch   18 Jun 2013 21:50:53 -  1.1
+++ apt.patch   20 Jun 2013 22:40:51 -  1.2
@@ -1,537 +1,1041 @@
-diff -ruN apt-0.9.8.2.orig/apt-pkg/contrib/macros.h 
apt-0.9.8.2/apt-pkg/contrib/macros.h
 apt-0.9.8.2.orig/apt-pkg/contrib/macros.h  2013-06-06 11:25:59.0 
-0600
-+++ apt-0.9.8.2/apt-pkg/contrib/macros.h   2013-06-18 11:55:07.0 
-0600
-@@ -57,7 +57,9 @@
- // some nice optional GNUC features
- #if __GNUC__ = 3
-   #define __must_check__attribute__ ((warn_unused_result))
-+ #ifndef __APPLE__
-   #define __deprecated__attribute__ ((deprecated))
+diff -ruN apt-0.9.8.2.orig/fink/patches/darwin-fixes.patch 
apt-0.9.8.2/fink/patches/darwin-fixes.patch
+--- apt-0.9.8.2.orig/fink/patches/darwin-fixes.patch   1969-12-31 
17:00:00.0 -0700
[...1540 lines suppressed...]
+++#  print   http://ftp.de.debian.org/debian,\n;;
++ #  print  and the special mirror scheme,\n;
++ #  print   mirror:http://www.debian.org/archivemirrors \n;
+++  print   file:@FINKPREFIX@/fink,\n;
+++  print   http://us.dl.sourceforge.net/fink/direct_download\n;;
++   print \n;
++ 
++   my $index = 0;
++@@ -246,7 +251,10 @@
++   push (@Config, get_source());
++ }
++ print \n;
++-print $boldon Would you like to add another source?[y/N]$boldoff ;
+++print $boldon In most cases, this file was installed by Fink or by apt,
+++   . and$boldoff\n;
+++print $boldon should NOT be changed.   .
+++Do you wish to change (overwrite) it?[y/N]$boldoff ;
++ my $answer = STDIN;
++ chomp ($answer);
++ $answer =~ s/\s+/ /og;

Index: apt.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apt.info18 Jun 2013 22:03:23 -  1.2
+++ apt.info20 Jun 2013 22:40:51 -  1.3
@@ -31,10 +31,13 @@
 
 
 PatchFile: %n.patch
-PatchFile-MD5: bc5df423d75d41ef303c8ecbba725dbf
+PatchFile-MD5: b18c35c99ff963379180b9c67e1ff3fd
 PatchScript: 
-# darwin specific changes
-sed -e 's|@FINKPREFIX@|%p|g'  %{PatchFile} | patch -p1
+osxversion=$(sw_vers -productVersion | perl -pi -e 's,(\d\.\d)(\.\d)+?,$1,g'); 
\
+sed -e 's|@FINKPREFIX@|%p|g' -e s|@DIST@|$osxversion|g  %{PatchFile} | 
patch -p1
+
+patch -p1  fink/patches/darwin-fixes.patch
+patch -p1  fink/patches/f-v-p.patch
 
 echo x86_64\tx86_64  %b/buildlib/archtable
 
@@ -44,7 +47,7 @@
 perl -pi -e 's,po4a,notpo4a,g' configure
 
 # fix paths
-for i in %b/po/*.po %b/po/*.pot %b/doc/po/*.po %b/doc/po/*.pot 
%b/doc/*.[13578] %b/doc/*.ent %b/doc/*.sgml %b/doc/*.xmli 
%b/doc/examples/apt-https-method-example.conf %b/doc/examples/configure-index 
%b/debian/apt.logrotate %b/apt-pkg/deb/debsystem.cc %b/apt-pkg/deb/dpkgpm.cc 
%b/apt-pkg/init.cc %b/apt-pkg/acquire-item.cc %b/apt-pkg/aptconfiguration.cc 
%b/apt-pkg/contrib/gpgv.cc %b/cmdline/apt-get.cc %b/cmdline/apt-key; do \
+for i in %b/po/*.po %b/po/*.pot %b/doc/po/*.po %b/doc/po/*.pot 
%b/doc/*.[13578] %b/doc/*.ent %b/doc/*.sgml %b/doc/*.xmli 
%b/doc/examples/apt-https-method-example.conf %b/doc/examples/configure-index 
%b/debian/apt.logrotate %b/apt-pkg/deb/debsystem.cc %b/apt-pkg/deb/dpkgpm.cc 
%b/apt-pkg/init.cc %b/apt-pkg/acquire-item.cc %b/apt-pkg/aptconfiguration.cc 
%b/apt-pkg/contrib/gpgv.cc %b/cmdline/apt-get.cc %b/cmdline/apt-key 
%b/dselect/install %b/dselect/update; do \
   perl -pi -e 's,/usr/,%p/,g' $i; \
   perl -pi -e 's,/var/,%p/var/,g' $i; \
   perl -pi -e 's,/etc/,%p/etc/,g' $i; \


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo fvp.patch, NONE, 1.1 apt.info, 1.3, 1.4 apt.patch, 1.2, 1.3

2013-06-20 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17661

Modified Files:
apt.info apt.patch 
Added Files:
fvp.patch 
Log Message:
fully working and tested apt upgrade, it required my dpkg branch to be used and 
my fvp.patch since it requires a more complete status file from 
fink-virtual-pkgs

Index: apt.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apt.patch   20 Jun 2013 22:40:51 -  1.2
+++ apt.patch   21 Jun 2013 04:13:59 -  1.3
@@ -541,8 +541,8 @@
 +  echo $TESTFAIL
 diff -ruN apt-0.9.8.2.orig/fink/patches/f-v-p.patch 
apt-0.9.8.2/fink/patches/f-v-p.patch
 --- apt-0.9.8.2.orig/fink/patches/f-v-p.patch  1969-12-31 17:00:00.0 
-0700
-+++ apt-0.9.8.2/fink/patches/f-v-p.patch   2013-06-20 14:52:56.0 
-0600
-@@ -0,0 +1,496 @@
 apt-0.9.8.2/fink/patches/f-v-p.patch   2013-06-20 21:07:38.0 
-0600
+@@ -0,0 +1,520 @@
 +diff -ruN apt-0.9.8.2.darwin/apt-pkg/deb/debindexfile.cc 
apt-0.9.8.2.f-v-p/apt-pkg/deb/debindexfile.cc
 +--- apt-0.9.8.2.darwin/apt-pkg/deb/debindexfile.cc2013-06-06 
11:25:59.0 -0600
  apt-0.9.8.2.f-v-p/apt-pkg/deb/debindexfile.cc 2013-06-20 
09:12:54.0 -0600
@@ -571,7 +571,7 @@
 ++}
 +diff -ruN apt-0.9.8.2.darwin/apt-pkg/deb/debsystem.cc 
apt-0.9.8.2.f-v-p/apt-pkg/deb/debsystem.cc
 +--- apt-0.9.8.2.darwin/apt-pkg/deb/debsystem.cc   2013-06-06 
11:25:59.0 -0600
- apt-0.9.8.2.f-v-p/apt-pkg/deb/debsystem.cc2013-06-20 
14:52:53.0 -0600
+ apt-0.9.8.2.f-v-p/apt-pkg/deb/debsystem.cc2013-06-20 
18:28:44.0 -0600
 +@@ -26,6 +26,113 @@
 + 
 + #include apti18n.h
@@ -780,18 +780,21 @@
 +return true;
 + }
 +  /*}}}*/
-+@@ -235,12 +401,16 @@
++@@ -235,12 +401,18 @@
 + bool debSystem::FindIndex(pkgCache::PkgFileIterator File,
 +pkgIndexFile *Found) const
 + {
 +-   if (d-StatusFile == 0)
-++   if (d-StatusFile == 0  f-StatusFile == 0)
+++   if (d-StatusFile == 0) {
 +   return false;
-+if (d-StatusFile-FindInCache(*File.Cache()) == File)
++-   if (d-StatusFile-FindInCache(*File.Cache()) == File)
+++   } else if (d-StatusFile-FindInCache(*File.Cache()) == File)
 +{
 +   Found = d-StatusFile;
 +   return true;
-++   }  else if (f-StatusFile-FindInCache(*File.Cache()) == File)
+++   } else if (f-StatusFile == 0) {
+++  return false;
+++   } else if (f-StatusFile-FindInCache(*File.Cache()) == File)
 ++   {
 ++  Found = f-StatusFile;
 ++  return true;
@@ -859,8 +862,18 @@
 + AR:=@AR@
 +diff -ruN apt-0.9.8.2.darwin/cmdline/apt-get.cc 
apt-0.9.8.2.f-v-p/cmdline/apt-get.cc
 +--- apt-0.9.8.2.darwin/cmdline/apt-get.cc 2013-06-19 22:30:46.0 
-0600
- apt-0.9.8.2.f-v-p/cmdline/apt-get.cc  2013-06-19 22:31:23.0 
-0600
-+@@ -360,7 +360,14 @@
+ apt-0.9.8.2.f-v-p/cmdline/apt-get.cc  2013-06-20 21:07:36.0 
-0600
++@@ -258,7 +258,8 @@
++  */
++ void ShowBroken(ostream out,CacheFile Cache,bool Now)
++ {
++-   if (Cache-BrokenCount() == 0)
+++   // FINK LOCAL added APT::Get::Ignore-Breakage test
+++   if (Cache-BrokenCount() == 0 || 
_config-FindB(APT::Get::Ignore-Breakage) == true)
++   return;
++ 
++out  _(The following packages have unmet dependencies:)  endl;
++@@ -360,7 +361,14 @@
 +if (Cache[Targ].CandidateVerIter(Cache).end() == true)
 +{
 +   if (Targ-ProvidesList == 0)
@@ -876,17 +889,18 @@
 +   else
 +  out  _(but it is a virtual package);
 +}   
-+@@ -846,7 +853,8 @@
++@@ -846,7 +854,9 @@
 + 
 +   // Install it with autoinstalling enabled (if we not respect the minial
 +   // required deps or the policy)
 +-  if (FixBroken == false)
+++ // FINK LOCAL added APT::Get::Ignore-Breakage test
 ++  if (FixBroken == false
 ++  _config-FindB(APT::Get::Ignore-Breakage) == false)
 +  doAutoInstallLater.insert(Pkg);
 +   }
 + 
-+@@ -1020,7 +1028,9 @@
++@@ -1020,7 +1030,9 @@
 +}
 + 
 +// Nothing is broken
@@ -897,7 +911,7 @@
 +   return true;
 + 
 +// Attempt to fix broken things
-+@@ -1129,7 +1139,9 @@
++@@ -1129,7 +1141,9 @@
 +Stats(c1out,Cache);
 + 
 +// Sanity check
@@ -908,7 +922,7 @@
 +{
 +   ShowBroken(c1out,Cache,false);
 +   return _error-Error(_(Internal error, InstallPackages was called 
with broken packages!));
-+@@ -1954,7 +1966,9 @@
++@@ -1954,7 +1968,9 @@
 +   /* If we are in the Broken fixing mode we do not attempt to fix the
 +   problems. This is if the user invoked install without -f and gave
 +   packages */
@@ -919,7 +933,7 @@
 +   {
 +   

[cvs] experimental/thesin/finkinfo libapt-pkg-pm.info,1.1,1.2

2013-06-19 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31038

Modified Files:
libapt-pkg-pm.info 
Log Message:
No more need to hardcode compilescript, fixed man pages for the deb validates

Index: libapt-pkg-pm.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/libapt-pkg-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libapt-pkg-pm.info  19 Jun 2013 03:56:05 -  1.1
+++ libapt-pkg-pm.info  19 Jun 2013 14:56:28 -  1.2
@@ -24,8 +24,15 @@
 
 
 CompileScript: 
-ARCHFLAGS= /usr/bin/arch -x86_64 perl5.12 Makefile.PL PERL=/usr/bin/arch 
-x86_64 perl5.12 PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/darwin-thread-multi-2level 
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/darwin-thread-multi-2level 
INSTALLMAN1DIR=%p/share/man/man1 INSTALLMAN3DIR=%p/share/man/man3 
INSTALLSITEMAN1DIR=%p/share/man/man1 INSTALLSITEMAN3DIR=%p/share/man/man3 
INSTALLBIN=%p/bin INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin
-make
+#ARCHFLAGS= /usr/bin/arch -x86_64 perl5.12 Makefile.PL PERL=/usr/bin/arch 
-x86_64 perl5.12 PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/darwin-thread-multi-2level 
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/darwin-thread-multi-2level 
INSTALLMAN1DIR=%p/share/man/man1 INSTALLMAN3DIR=%p/share/man/man3 
INSTALLSITEMAN1DIR=%p/share/man/man1 INSTALLSITEMAN3DIR=%p/share/man/man3 
INSTALLBIN=%p/bin INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin
+#make
+  %{default_script} CC=g++
+
+
+InstallScript: 
+  %{default_script}
+
+  /bin/mv %i/share/man %i/lib/perl5/%type_raw[perl]
 
 
 DocFiles: MANIFEST MANIFEST.skip debian/changelog debian/copyright examples


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo apt.info, NONE, 1.1 apt.patch, NONE, 1.1 fink-archive-keyring.info, NONE, 1.1 jetring.info, NONE, 1.1

2013-06-18 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21613

Added Files:
apt.info apt.patch fink-archive-keyring.info jetring.info 
Log Message:
New Apt and friends, requires new dpkg fork


--- NEW FILE: jetring.info ---
Package: jetring
Version: 0.20
Revision: 1.1

Source: mirror:debian:pool/main/j/%n/%n_%v.tar.gz
Source-MD5: 9b3eee52e834caea9c8f21996f973c6b
SourceDirectory: %n

BuildDepends: 
  dpkg-dev (= 1.9.0)


Depends: 
  coreutils,
  gnupg2


PatchScript: 
  perl -pi -e 's,/usr,,' Makefile
  perl -pi -e 's,readlink -f,greadlink -f,g' jetring-accept jetring-build 
jetring-explode
  perl -pi -e 's,sha1sum,gsha1sum,g' jetring-accept jetring-checksum 
jetring-explode 
  perl -pi -e 's,sha256sum,gsha256sum,g' jetring-accept jetring-checksum 
jetring-explode
  perl -pi -e 's,\$type\.,g\.\$type\.,g' jetring-checksum
  perl -pi -e 's,gpg,gpg2,g' jetring-accept jetring-apply jetring-build 
jetring-diff jetring-explode jetring-gen jetring-review jetring-signindex 
  perl -pi -e 's,\.gpg2,\.gpg,g' jetring-accept jetring-apply jetring-build 
jetring-diff jetring-explode jetring-gen jetring-review jetring-signindex 


CompileScript: 
  make build


InstallScript: 
  make install DESTDIR=%i

  install -d -m755 %i/share/man/man1
  install -d -m755 %i/share/man/man7

  install -m644 *.1 %i/share/man/man1
  install -m644 *.7 %i/share/man/man7


DocFiles: README sample.changeset debian/changelog GPL example:examples

Description: GPG keyring maintenance using changesets
DescDetail: 
jetring is a collection of tools that allow for gpg keyrings to be maintained
using changesets. It was developed with the Debian keyring in mind, and aims
to solve the problem that a gpg keyring is a binary blob that's hard for
multiple people to collaboratively edit.
.
With jetring, changesets can be submitted, reviewed to see exactly what they
will do, applied, and used to build a keyring. The origin of every change
made to the keyring is available for auditing, and gpg signatures can be used
to further secure things.


License: GPL
Maintainer: Fink Core Group fink-c...@lists.sourceforge.net
Homepage: http://kitenet.net/~joey/code/jetring/

--- NEW FILE: apt.patch ---
diff -ruN apt-0.9.8.2.orig/apt-pkg/contrib/macros.h 
apt-0.9.8.2/apt-pkg/contrib/macros.h
--- apt-0.9.8.2.orig/apt-pkg/contrib/macros.h   2013-06-06 11:25:59.0 
-0600
+++ apt-0.9.8.2/apt-pkg/contrib/macros.h2013-06-18 11:55:07.0 
-0600
@@ -57,7 +57,9 @@
 // some nice optional GNUC features
 #if __GNUC__ = 3
#define __must_check__attribute__ ((warn_unused_result))
+ #ifndef __APPLE__
#define __deprecated__attribute__ ((deprecated))
+ #endif
#define __attrib_const  __attribute__ ((__const__))
/* likely() and unlikely() can be used to mark boolean expressions
   as (not) likely true which will help the compiler to optimise */
diff -ruN apt-0.9.8.2.orig/apt-pkg/contrib/strutl.h 
apt-0.9.8.2/apt-pkg/contrib/strutl.h
--- apt-0.9.8.2.orig/apt-pkg/contrib/strutl.h   2013-06-06 11:25:59.0 
-0600
+++ apt-0.9.8.2/apt-pkg/contrib/strutl.h2013-06-17 15:56:40.0 
-0600
@@ -150,4 +150,292 @@
 unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin,
  const char **ListEnd);
 
+#if defined(__APPLE__)
+inline char *strchrnul( const char *s, int c )
+{
+   for (; *s != c  *s != '\0'; ++s)
+   ;
+   return (char *)s;
+}
+
+inline void *
+rawmemchr (const void *s, int c_in)
+{
+  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
+ long instead of a 64-bit uintmax_t tends to give better
+ performance.  On 64-bit hardware, unsigned long is generally 64
+ bits already.  Change this typedef to experiment with
+ performance.  */
+  typedef unsigned long int longword;
+
+  const unsigned char *char_ptr;
+  const longword *longword_ptr;
+  longword repeated_one;
+  longword repeated_c;
+  unsigned char c;
+
+  c = (unsigned char) c_in;
+
+  /* Handle the first few bytes by reading one byte at a time.
+ Do this until CHAR_PTR is aligned on a longword boundary.  */
+  for (char_ptr = (const unsigned char *) s;
+   (size_t) char_ptr % sizeof (longword) != 0;
+   ++char_ptr)
+if (*char_ptr == c)
+  return (void *) char_ptr;
+
+  longword_ptr = (const longword *) char_ptr;
+
+  /* All these elucidatory comments refer to 4-byte longwords,
+ but the theory applies equally well to any size longwords.  */
+
+  /* Compute auxiliary longword values:
+ repeated_one is a value which has a 1 in every byte.
+ repeated_c has c in every byte.  */
+  repeated_one = 0x01010101;
+  repeated_c = c | (c  8);
+  repeated_c |= repeated_c  16;
+  if (0xU  (longword) -1)
+{
+  repeated_one |= repeated_one  31  1;
+  repeated_c |= repeated_c  31  1;
+  if (8  sizeof (longword))
+{
+  size_t i;
+
+  for (i 

[cvs] experimental/thesin/finkinfo apt.info,1.1,1.2

2013-06-18 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22112

Modified Files:
apt.info 
Log Message:
Forgot to conflict/replace apt-dev

Index: apt.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.info18 Jun 2013 21:50:53 -  1.1
+++ apt.info18 Jun 2013 22:03:23 -  1.2
@@ -346,6 +346,8 @@
 
 SplitOff4: 
   Package: lib%N-pkg-dev
+  Conflicts: apt-dev
+  Replaces: apt-dev
   BuildDependsOnly: true
   Depends: 
 lib%N-inst1.5-shlibs (= %v-%r),


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo apt-file.info, NONE, 1.1 libapt-pkg-pm.info, NONE, 1.1

2013-06-18 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5274

Added Files:
apt-file.info libapt-pkg-pm.info 
Log Message:
New ports

--- NEW FILE: apt-file.info ---
Package: apt-file
Version: 2.4.0
Revision: 1.1
###
BuildDepends: 
  docbook-utils,
  config-file-pm,
  list-moreutils-pm5124,
  regexp-assemble-pm,
  file-temp-pm5124

Depends: 
  perl5124-core,
  curl,
  config-file-pm,
  list-moreutils-pm5124,
  regexp-assemble-pm,
  file-temp-pm5124,
  libapt-pkg-pm5124

Recommends: 
  python3

Suggests: 
  openssh-client,
  sudo

###
Source: mirror:debian:/pool/main/a/apt-file/apt-file_%v.tar.gz
Source-MD5: 1b4cc15eda7e9bfe1ae6a80ddba1d2c5
SourceDirectory: apt-file-%v
###
#PatchFile: %n.patch
#PatchFile-MD5: 9b6869ce0d082d35aec1966ea01f9628
PatchScript: 
#sed 's|@FINKPREFIX@|%p|g'  %{PatchFile} | patch -p1
  perl -pi -e 's,\/usr,%p,g' debian/apt-file.do-apt-file-update 
apt-file.update-notifier apt-file*.sgml apt-file.spec rapt-file 
rapt-file.wrapper
  perl -pi -e 's,\/var\/,%p\/var\/,g' debian/apt-file.is-cache-empty 
apt-file*.sgml
  perl -pi -e 's,\/etc\/,%p\/etc\/,g' apt-file apt-file*.sgml apt-file.spec 
rapt-file

  perl -pi -e 's,\/usr,,g' Makefile

###
CompileScript: 
  make all

###
InfoTest: 
  TestScript: 
make test || exit 2
  

###
InstallScript: 
  make install DESTDIR=%i

  install -d -m755 %i/share/%n
  install -d -m755 %i/var/cache/apt/%n

  perl -p -i -e 's/^use constant VERSION.*/use constant VERSION = %v;/' 
%i/bin/apt-file
  install -m 644 debian/apt-file.update-notifier 
%i/share/apt-file/apt-file-update.update-notifier
  install -m 755 debian/apt-file.do-apt-file-update 
%i/share/apt-file/do-apt-file-update
  install -m 755 debian/apt-file.is-cache-empty %i/share/apt-file/is-cache-empty
  install -m 755 rapt-file %i/share/apt-file/rapt-file
  install -m 755 rapt-file.wrapper %i/bin/rapt-file


###
ConfFiles: 
  %p/etc/apt/apt-file.conf

DocFiles: README changelog debian/copyright
###
PostInstScript: 
set -e

if [ $1 != configure ]; then
exit 0
fi

# fix wrong permissions created by old versions
if [ -n $2 ] 
   dpkg --compare-versions $2 lt 2.1.5~ 
   ! dpkg-statoverride --list %p/var/cache/apt/%n  /dev/null 21
then
   chmod 755 %p/var/cache/apt/%n
fi

unud=%p/var/lib/update-notifier/user.d

if %p/share/%n/is-cache-empty; then
echo The system-wide cache is empty. You may want to run 'apt-file 
update'
echo as root to update the cache. You can also run 'apt-file update' 
as
echo normal user to use a cache in the user's home directory.
fi

if [ -d $unud ]; then
cp -f %p/share/%n/apt-file-update.update-notifier \
$unud/apt-file-update
fi

PostRmScript: 
set -e;

if [ purge = $1 ]; then
rm -fr %p/var/cache/apt/%n/
rm -f %p/var/lib/update-notifier/user.d/apt-file-update
fi;

Description: Search for files within deb packages (CLI)
DescDetail: 
apt-file is a command line tool for searching files contained in packages
for the APT packaging system. You can search in which package a file is
included or list the contents of a package without installing or fetching it.

License: GPL
Homepage: http://packages.qa.debian.org/a/apt-file.html
Maintainer: Justin F. Hallett the...@users.sourceforge.net

--- NEW FILE: libapt-pkg-pm.info ---
Info2:
Package: libapt-pkg-pm%type_pkg[perl]
Version: 0.1.28
Revision: 1.1
Type: perl (5.12.4 5.12.5)

BuildDepends: 
  libapt-pkg-dev

Depends: 
  perl%type_pkg[perl]-core,
  libapt-pkg4.12-shlibs


Source: mirror:debian:/pool/main/liba/libapt-pkg-perl/libapt-pkg-perl_%v.tar.gz
Source-MD5: 61edfa654a37ee4adae6942331008471
SourceDirectory: libapt-pkg-perl-%v

PatchScript: 
  perl -pi -e 's,c\+\+,g\+\+,g' Makefile.PL
  perl -pi -e 's,-lapt-pkg,-L%p/lib -lapt-pkg,g' Makefile.PL
  perl -pi -e s;XSOPT;INC   = '-I%p/include',\n   XSOPT;g Makefile.PL
  perl -pi -e 's,/etc/apt/,%p/etc/apt/,g' t/00_config.t


CompileScript: 
ARCHFLAGS= /usr/bin/arch -x86_64 perl5.12 Makefile.PL PERL=/usr/bin/arch 
-x86_64 perl5.12 PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/darwin-thread-multi-2level 
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/darwin-thread-multi-2level 
INSTALLMAN1DIR=%p/share/man/man1 INSTALLMAN3DIR=%p/share/man/man3 
INSTALLSITEMAN1DIR=%p/share/man/man1 INSTALLSITEMAN3DIR=%p/share/man/man3 
INSTALLBIN=%p/bin INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin
make


DocFiles: MANIFEST MANIFEST.skip debian/changelog debian/copyright examples
UpdatePOD: true

Description: Perl interface to libapt-pkg
DescDetail: 
A Perl interface to APT's libapt-pkg which provides modules for configuration
file/command line parsing, version comparison, inspection of the binary
package cache and source package details.


License: GPL
Homepage: http://packages.qa.debian.org/liba/libapt-pkg-perl.html
Maintainer: Justin F. Hallett

[cvs] dists/10.7/stable/main/finkinfo/libs libnewt0-shlibs.info, 1.1, 1.2

2013-06-17 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25992

Modified Files:
libnewt0-shlibs.info 
Log Message:
  * Ensure unowned files get removed on purge.( %p/etc/newt/palette).


Index: libnewt0-shlibs.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libnewt0-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libnewt0-shlibs.info28 May 2013 20:41:48 -  1.1
+++ libnewt0-shlibs.info17 Jun 2013 19:48:42 -  1.2
@@ -1,6 +1,6 @@
 Package: libnewt0-shlibs
 Version: 0.52.15
-Revision: 1.1
+Revision: 2.1
 ###
 Source: mirror:debian:pool/main/n/newt/newt_%v.orig.tar.gz
 Source-MD5: 343ee3a0fd0eacdb7c508a1e1cfabf65
@@ -103,6 +103,13 @@
 ;;
 esac
 
+PreRmScript: 
+set -e
+
+if [ $1 = remove ] || [ $1 = deconfigure ]; then
+   update-alternatives --remove-all newt-palette
+fi
+
 ConfFiles: %p/etc/newt/palette.original
 DocFiles: CHANGES COPYING
 Description: Not Erik's Windowing Toolkit


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo texinfo.info,1.14,1.15

2013-06-13 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28013

Modified Files:
texinfo.info 
Log Message:
Sync with current changes in fink stable

Index: texinfo.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- texinfo.info9 Jun 2013 13:54:05 -   1.14
+++ texinfo.info13 Jun 2013 15:14:28 -  1.15
@@ -1,6 +1,6 @@
 Package: texinfo
 Version: 5.1
-Revision: 1.1
+Revision: 2.1
 Source: gnu
 Source-MD5: 54e250014fe698fb4832016158747c03
 SourceDirectory: %n-%v
@@ -50,7 +50,7 @@
   TestScript: make check || exit 2
 
 InstallScript: 
-  make install prefix=%i mandir=%i/share/man infodir=%i/share/info
+  AM_UPDATE_INFO_DIR=no make install prefix=%i mandir=%i/share/man 
infodir=%i/share/info
   TEXMF=%i/share/texmf make install-tex prefix=%i mandir=%i/share/man 
infodir=%i/share/info
   find %i -type f -name dir | xargs rm -f
 


--
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo texinfo.info,1.13,1.14

2013-06-09 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14023

Modified Files:
texinfo.info 
Log Message:
Update from dmacks for InfoTests

Index: texinfo.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- texinfo.info23 May 2013 17:59:06 -  1.13
+++ texinfo.info9 Jun 2013 13:54:05 -   1.14
@@ -46,7 +46,8 @@
   make
 
 InfoTest: 
-  TestScript: make check ALL_TESTS=yes || exit 2
+  TestConflicts: pod-simple-pm
+  TestScript: make check || exit 2
 
 InstallScript: 
   make install prefix=%i mandir=%i/share/man infodir=%i/share/info


--
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web zendframework.info, 1.4, 1.5 zendframework.patch, 1.2, 1.3

2013-06-04 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19404

Modified Files:
zendframework.info zendframework.patch 
Log Message:
   * new upstream release
   * removed windows azure stuff for windows platform from library path


Index: zendframework.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/zendframework.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- zendframework.info  7 Jan 2013 15:56:25 -   1.4
+++ zendframework.info  4 Jun 2013 16:02:51 -   1.5
@@ -1,20 +1,19 @@
 Package: zendframework
-Version: 1.11.13
+Version: 1.12.3
 Revision: 1.1
 ###
 Depends: php5 | php5-cli
 Suggests: php5-curl, php5-gd, php5-imap, php5-ldap, php5-mysql, php5-pgsql, 
php5-json, php5-sqlite
 ###
 Source: 
http://framework.zend.com/releases/ZendFramework-%v/ZendFramework-%v.tar.gz
-Source-MD5: 65292f8e801bb1caadd1882659b4841b
+Source-MD5: a74b1e332c714f1a8bc8923ccd03eea3
 ###
 PatchFile: %n.patch
-PatchFile-MD5: 637f6e486ca49f19fca02eb80e0dab60
+PatchFile-MD5: 11d629b77bbbd57baeae4e4a682ac168
 PatchScript: 
 sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
 patch -p1  fink/patches/zf-shell.patch
-patch -p1  fink/patches/ZF2012-05.patch
 
 ###
 DocFiles: *.txt
@@ -34,6 +33,9 @@
 install -m0644 fink/manpage/zf.8 %i/share/man/man8/zf.8
 
 find %i/share/php/Zend -type f | xargs chmod 0644
+
+# remove windows stuff
+rm -rf 
%i/share/php/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/resources/PhpOnAzure.Web
 
 ###
 SplitOff: 

Index: zendframework.patch
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/web/zendframework.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- zendframework.patch 7 Jan 2013 15:56:26 -   1.2
+++ zendframework.patch 4 Jun 2013 16:02:51 -   1.3
@@ -1,6 +1,6 @@
-diff -ruN ZendFramework-1.11.13.orig/fink/manpage/zf.8 
ZendFramework-1.11.13/fink/manpage/zf.8
 ZendFramework-1.11.13.orig/fink/manpage/zf.8   1969-12-31 
17:00:00.0 -0700
-+++ ZendFramework-1.11.13/fink/manpage/zf.82013-01-07 08:35:28.0 
-0700
+diff -ruN ZendFramework-1.12.3.orig/fink/manpage/zf.8 
ZendFramework-1.12.3/fink/manpage/zf.8
+--- ZendFramework-1.12.3.orig/fink/manpage/zf.81969-12-31 
17:00:00.0 -0700
 ZendFramework-1.12.3/fink/manpage/zf.8 2013-01-07 08:35:28.0 
-0700
 @@ -0,0 +1,46 @@
 +.TH ZF 8 2010-02-12 1.10.1 zendframework tool
 +
@@ -48,459 +48,9 @@
 +The development is currently coordinated by Zend Technologies Ltd. 
\fIhttp://framework.zend.com\fR.
 +.PP
 +This manual page was written by Frank Habermann 
\filordla...@lordlamer.de\fR, for the Debian project (but may be used by 
others).
-diff -ruN ZendFramework-1.11.13.orig/fink/patches/ZF2012-05.patch 
ZendFramework-1.11.13/fink/patches/ZF2012-05.patch
 ZendFramework-1.11.13.orig/fink/patches/ZF2012-05.patch1969-12-31 
17:00:00.0 -0700
-+++ ZendFramework-1.11.13/fink/patches/ZF2012-05.patch 2013-01-07 
08:38:32.0 -0700
-@@ -0,0 +1,446 @@
-+Index: zendframework-1.11.13/library/Zend/Feed.php
-+===
-+--- zendframework-1.11.13.orig/library/Zend/Feed.php  2012-01-05 
22:27:01.0 +0100
- zendframework-1.11.13/library/Zend/Feed.php   2012-12-25 
17:31:38.238088865 +0100
-+@@ -191,7 +191,8 @@
-+ public static function importString($string)
-+ {
-+ // Load the feed as an XML DOMDocument object
-+-$libxml_errflag = libxml_use_internal_errors(true);
-++$libxml_errflag   = libxml_use_internal_errors(true);
-++$libxml_entity_loader = libxml_disable_entity_loader(true);
-+ $doc = new DOMDocument;
-+ if (trim($string) == '') {
-+ require_once 'Zend/Feed/Exception.php';
-+@@ -199,9 +200,9 @@
-+ . ' is an Empty string or comes from an empty HTTP response');
-+ }
-+ $status = $doc-loadXML($string);
-++libxml_disable_entity_loader($libxml_entity_loader);
-+ libxml_use_internal_errors($libxml_errflag);
-+ 
-+-
-+ if (!$status) {
-+ // prevent the class to generate an undefined variable notice 
(ZF-2590)
-+ // Build error message
-+Index: zendframework-1.11.13/library/Zend/Feed/Abstract.php
-+===
-+--- zendframework-1.11.13.orig/library/Zend/Feed/Abstract.php 2012-01-05 
22:27:01.0 +0100
- zendframework-1.11.13/library/Zend/Feed/Abstract.php  2012-12-25 
17:31:38.234088865 +0100
-+@@ -81,9 +81,9 @@
-+  * @see Zend_Feed_Exception
-+  */
-+ require_once 'Zend/Feed/Exception.php';
-+-throw new 

[cvs] experimental/thesin/finkinfo ucf.info,1.10,1.11

2013-05-29 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28425

Modified Files:
ucf.info 
Log Message:
New upstream release

Index: ucf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/ucf.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ucf.info5 Apr 2013 19:05:16 -   1.10
+++ ucf.info29 May 2013 15:03:21 -  1.11
@@ -1,5 +1,5 @@
 Package: ucf
-Version: 3.0025+nmu3
+Version: 3.0027
 Revision: 1
 ###
 BuildDepends: 
@@ -14,7 +14,7 @@
 
 ###
 Source: mirror:debian:pool/main/u/%n/%n_%v.tar.gz
-Source-MD5: a3f802fff918438dc9a05a5e29e2dc86
+Source-MD5: c27e52f52cace7294de6416249381d9c
 SourceDirectory: %n-%v
 ###
 PatchScript: 


--
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with 2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info, 1.42, 1.43 dpkg.patch, 1.18, 1.19

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17345

Modified Files:
dpkg.info dpkg.patch 
Log Message:
  * Add simulated binary mode to md5sum for ffmpeg, md5sum wrapper will likely
be deprecated in the future so do not depend on this wrapper.  Also binary
mode is simulated it can't actually determine if it's binary, I just add
an asterisk in front of the file name when -b is passed.


Index: dpkg.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dpkg.patch  21 May 2013 20:49:24 -  1.18
+++ dpkg.patch  28 May 2013 14:34:15 -  1.19
@@ -1,7 +1,7 @@
 diff -ruN dpkg-1.16.10.orig/fink/md5sum dpkg-1.16.10/fink/md5sum
 --- dpkg-1.16.10.orig/fink/md5sum  1969-12-31 17:00:00.0 -0700
-+++ dpkg-1.16.10/fink/md5sum   2012-07-02 16:14:45.0 -0600
-@@ -0,0 +1,313 @@
 dpkg-1.16.10/fink/md5sum   2013-05-28 08:30:00.0 -0600
+@@ -0,0 +1,322 @@
 +#!/usr/bin/perl
 +use strict;
 +use warnings;
@@ -14,6 +14,7 @@
 +# GNU General Public License version 2.
 +
 +my $md5_bin = /sbin/md5;
++my $binary_mode = ;
 +my $check_mode = 0;
 +my $quiet = 0;
 +my $warn  = 0;
@@ -49,7 +50,7 @@
 +  if( $file eq - and $stdin_done )
 +  {
 +# second - is empty, so md5sum is of the empty string
-+print d41d8cd98f00b204e9800998ecf8427e  -\n;
++print d41d8cd98f00b204e9800998ecf8427e  $binary_mode-\n;
 +next;
 +  }
 +
@@ -60,7 +61,7 @@
 +  }
 +
 +  # the old md5sum, nor md5, understand binary mode, so...
-+  print $checksum  $file\n;
++  print $checksum  $binary_mode$file\n;
 +
 +  if( $file eq - )
 +  {
@@ -132,10 +133,14 @@
 +  {
 +version_and_exit();
 +  }
-+  elsif( $opt eq binary or $opt eq text )
++  elsif( $opt eq text )
 +  {
 +# ignore
 +  }
++  elsif( $opt eq binary )
++  {
++$binary_mode = *;
++  }
 +  elsif( $opt eq check )
 +  {
 +$check_mode = 1;
@@ -165,10 +170,14 @@
 +{
 +  my @opts = split //, $1;
 +  for(@opts) {
-+if( $_ eq b or $_ eq t )
++if( $_ eq t )
 +{
 +  # ignore
 +}
++elsif( $_ eq b )
++{
++  $binary_mode = *;
++}
 +elsif( $_ eq c )
 +{
 +  $check_mode = 1;

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dpkg.info   21 May 2013 20:49:24 -  1.42
+++ dpkg.info   28 May 2013 14:34:15 -  1.43
@@ -36,7 +36,7 @@
 Source-MD5: a20a06a5272717274a8b009368f237da
 
 PatchFile: dpkg.patch
-PatchFile-MD5: 76944f14e19764a76461b084c0cc8af9
+PatchFile-MD5: 30d353628371c0eb464812cf25384122
 
 PatchScript: 
 sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1


--
Try New Relic Now  We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app,  servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web nodejs.info,1.1,1.2

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18919

Modified Files:
nodejs.info 
Log Message:
Force BSDsed with BSD sed syntax in install script, no rev up as it doesn't 
change the deb, it just stopped some from being able to build it.

Index: nodejs.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/nodejs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nodejs.info 5 Jul 2012 23:35:20 -   1.1
+++ nodejs.info 28 May 2013 14:49:40 -  1.2
@@ -43,7 +43,7 @@
   install -m0644 fink/node-waf.bash-completion 
%i/etc/bash_completion.d/node-waf
 
   find %i/share/doc/%n -name *.json -delete
-  sed -i -e '/document\.write/d' -e '/pageTracker/d' %i/share/doc/%n/api/*.html
+  /usr/bin/sed -i  -e '/document\.write/d' -e '/pageTracker/d' 
%i/share/doc/%n/api/*.html
 
 ###
 InfoTest: 


--
Try New Relic Now  We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app,  servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/net lftp.info,1.4,1.5

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20130

Modified Files:
lftp.info 
Log Message:
  * New upstream release
  * Patch module.cc to look for .so not .bundle, since it builds .so and not
.bundle.


Index: lftp.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/lftp.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lftp.info   3 Aug 2012 03:57:16 -   1.4
+++ lftp.info   28 May 2013 15:03:57 -  1.5
@@ -1,6 +1,6 @@
 Package: lftp
-Version: 4.3.7
-Revision: 2
+Version: 4.4.7
+Revision: 1
 ###
 Depends: %N-shlibs (= %v-%r), expat1-shlibs, readline6-shlibs, 
openssl100-shlibs
 BuildDepends: expat1, libgettext8-dev, libiconv-dev, libncurses5, readline6, 
openssl100-dev, fink (= 0.28)
@@ -11,7 +11,11 @@
 
 ###
 Source: mirror:custom:lftp-%v.tar.bz2
-Source-MD5: 7216925813c7b09d22b54340b98daf7f
+Source-MD5: a4e7b88d6b7aca389010ce6d6dca8099
+###
+PatchScript: 
+  perl -pi -e 's,bundle,so,g' src/module.cc
+
 ###
 SetCXX: g++
 ###


--
Try New Relic Now  We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app,  servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/libs libnewt0-shlibs.info, NONE, 1.1 libnewt0-shlibs.patch, NONE, 1.1

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2282

Added Files:
libnewt0-shlibs.info libnewt0-shlibs.patch 
Log Message:
New port bring whiptail to fink a lightweight dialog replacement

--- NEW FILE: libnewt0-shlibs.info ---
Package: libnewt0-shlibs
Version: 0.52.15
Revision: 1.1
###
Source: mirror:debian:pool/main/n/newt/newt_%v.orig.tar.gz
Source-MD5: 343ee3a0fd0eacdb7c508a1e1cfabf65
SourceDirectory: newt-%v
###
BuildDepends: 
  fink (= 0.28),
  slang2,
  popt,
  gettext-tools,
  libgettext8-dev,
  tcltk-dev,
  python33,
  autoconf2.6,
  automake1.11

#  sgmltools-lite,
Depends: 
  slang2-shlibs,
  libgettext8-shlibs

###
PatchFile: %n.patch
PatchFile-MD5: 805e321c9ed21bcbda35090f6b6ffc36
PatchScript: 
  sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1

  # Debian Patches
  patch -p1  fink/patches/endianness.patch
  patch -p1  fink/patches/tcl8x.patch
  patch -p1  fink/patches/python_memory_allocation.patch
  patch -p1  fink/patches/escape_key.patch
  patch -p1  fink/patches/python_init_once.patch
  patch -p1  fink/patches/messagebox_escape.patch
  patch -p1  fink/patches/python3.patch
  patch -p1  fink/patches/compiler-warnings.patch

  perl -pi -e 's, -shared \$, -bundle \$,g' Makefile.in
  perl -pi -e 's, --shared \$\$PLDFLAGS, -bundle \$\$PLDFLAGS,g' Makefile.in

  perl -pi -e 's,Tcl_setResult,Tcl_SetResult,g' whiptcl.c

  perl -pi -e 's,LIBTCL = .TCL_LIB_FLAG.,LIBTCL = -ltcl,g' Makefile.in
  perl -pi -e 's,PYTHONVERS = .PYTHONVERS.,PYTHONVERS = python3.3,g' Makefile.in

  perl -pi -e 's, -I/usr/include/slang,,g' Makefile.in

  perl -pi -e 's,SONAME = .SONAME.,SONAME = 0,g' Makefile.in
  perl -pi -e 's,LIBNEWTSH = libnewt\.so\.\$\(VERSION\),LIBNEWTSH = 
libnewt\.\$\(VERSION\)\.dylib,g' Makefile.in
  perl -pi -e 's,LIBNEWTSONAME = libnewt\.so\.\$\(SONAME\),LIBNEWTSONAME = 
libnewt\.\$\(SONAME\)\.dylib,g' Makefile.in
  perl -pi -e 's;SHLIBFLAGS=$;SHLIBFLAGS=-dynamiclib -compatibility_version 1 
-current_version 1 -install_name %p/lib/\$\(LIBNEWTSONAME\);g' Makefile.in
  perl -pi -e 's,libnewt\.so,libnewt\.dylib,g' Makefile.in

  ### Fix things to work in fink root
  perl -pi -e 's,/usr,%p,' *.py newt.spec nls.h

ConfigureParams: 
  --without-gpm-support \
  --with-colorsfile=%p/etc/newt/palette

CompileScript: 
  # Nasty hack. why is it necessary?
  cp %p/share/automake-1.11/install-sh ./install-sh

  #./autogen.sh
  ./configure %c
  make
  #sgmltools --backend html tutorial.sgml
  # ar cqv libnewt_pic.a shared/*.o

InstallScript: 
  make install DESTDIR=%d

  # examples
  install -d -m 755 examples
  install -m 644 testtree.c test.c testgrid.c examples

  for v in python3.3; do \
install -d -m 755 %i/lib/$v/dist-packages; \
install -m 755 snack.py $v/* %i/lib/$v/dist-packages; \
  done

  install -m 644 libnewt.a %i/lib

  install -d -m 755 %i/etc/newt
  install -m 644 %b/fink/palette.original %i/etc/newt/

###
Shlibs: 
  %p/lib/libnewt.0.dylib 1.0.0 libnewt0-shlibs (= 0.52.10-1.1)

###
PostInstScript: 
set -e

case $1 in
configure)
# Install alternatives
update-alternatives --install %p/etc/newt/palette newt-palette 
%p/etc/newt/palette.original 20
;;
esac

ConfFiles: %p/etc/newt/palette.original
DocFiles: CHANGES COPYING
Description: Not Erik's Windowing Toolkit
DescDetail: 
Newt is a windowing toolkit for text mode built from the slang library.
It allows color text mode applications to easily use stackable windows,
push buttons, check boxes, radio buttons, lists, entry fields, labels,
and displayable text. Scrollbars are supported, and forms may be nested
to provide extra functionality. This package contains the shared library
for programs that have been built with newt.

SplitOff: 
  Package: libnewt-dev
  BuildDependsOnly: true
  Depends: 
%N (= %v-%r)
  
  Files: 
include
lib/libnewt.{a,dylib}
lib/pkgconfig
  
  DocFiles: CHANGES COPYING newt.spec examples
  Description: Developer's toolkit for newt windowing library
  DescDetail: 
These are the header files and libraries for developing applications
which use newt. Newt is a windowing toolkit for text mode, which provides
many widgets and stackable windows.
  

SplitOff2: 
  Package: newt-tcl
  Depends: 
%N (= %v-%r),
tcltk, 
tcltk-shlibs,
popt-shlibs,
libgettext8-shlibs
  
  Files: 
lib/whiptcl.so
  
  DocFiles: CHANGES COPYING
  Description: NEWT module for Tcl
  DescDetail: 
This module allows you to build a text UI for your Tcl scripts
using newt.
  

SplitOff3: 
  Package: newt-py33
  Depends: 
%N (= %v-%r)
  
  Files: 
lib/python3.3
  
  DocFiles: CHANGES COPYING
  Description: NEWT module for Python3
  DescDetail: 
This module allows you to built a text UI for your Python3 scripts
using newt.
  

SplitOff5: 
  Package: whiptail
  Depends: 
%N (= %v-%r),
slang2-shlibs,
libgettext8-shlibs,
popt-shlibs
  
  Files: 
bin
share/man
  
  DocFiles: 

[cvs] experimental/thesin/finkinfo debconf.info,1.13,1.14

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2395

Modified Files:
debconf.info 
Log Message:
Add whiptail as a dialog replacement, it is prefered

Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- debconf.info15 May 2013 16:09:43 -  1.13
+++ debconf.info28 May 2013 20:42:58 -  1.14
@@ -13,7 +13,7 @@
 
 Depends: 
   dpkg ( 1.15),
-  dialog,
+  whiptail | dialog,
   gettext-tools
 
 Conflicts: 


--
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with 2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/libs/perlmods regexp-assemble-pm.info, NONE, 1.1

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4835

Added Files:
regexp-assemble-pm.info 
Log Message:
Add port

--- NEW FILE: regexp-assemble-pm.info ---
Package: regexp-assemble-pm
Version: 0.35
Revision: 1
Type: perl
Description: Assemble multiple Regular Expressions
License: Artistic
Maintainer: Fink Devel fink-de...@lists.sourceforge.net

BuildDepends: 
extutils-makemaker-pm (= 6.30)


Source: mirror:cpan:authors/id/D/DL/DLAND/Regexp-Assemble-%v.tar.gz
Source-MD5: 315796ece5bfb69b166846ced911cf0e

UpdatePOD: true
DocFiles: Changes README

Homepage: http://search.cpan.org/dist/Regexp-Assemble
DescDetail: 
Assemble multiple Regular Expressions into a single RE



--
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with 2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/libs/perlmods config-file-pm.info, NONE, 1.1

2013-05-28 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5787

Added Files:
config-file-pm.info 
Log Message:
New Port

--- NEW FILE: config-file-pm.info ---
Package: config-file-pm
Version: 1.50
Revision: 1
Type: perl
Description: Parse a simple configuration file
License: GPL
Maintainer: Fink Devel fink-de...@lists.sourceforge.net
DescDetail: 
Parse a simple configuration file


# Dependencies:
BuildDepends: 
  test-pod-pm,
  test-pod-coverage-pm


# Unpack Phase:
Source: mirror:cpan:authors/id/G/GW/GWOLF/Config-File-%v.tar.gz
Source-MD5: ea1f012b4336697be1c2e4cc2c3396e0

# Install Phase:
UpdatePOD: True
DocFiles: CHANGES MANIFEST README LICENSE
InstallScript: 
 %{default_script}
 mkdir -p %i/share
 mv %i/man %i/share
 mv %i/lib/perl5/site_perl/* %i/lib/perl5
 rm -rf %i/lib/perl5/site_perl


# Additional Info:
Homepage: http://search.cpan.org/dist/Config-File/


--
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with 2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo mime-support.info, NONE, 1.1 php5.info, 1.12, 1.13 texinfo.info, 1.12, 1.13

2013-05-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25661

Modified Files:
php5.info texinfo.info 
Added Files:
mime-support.info 
Log Message:
Update for new Triggers field

--- NEW FILE: mime-support.info ---
Package: mime-support
Version: 3.52
Revision: 1.1
Maintainer: Fink Core Group fink-c...@lists.sourceforge.net
BuildDepends: fink (= 0.34.99.git)
Conflicts: a2ps (4.10.4), metamail (2.7-44)
Replaces: apache2-common ( 2.2.22-8), apache2.2-common ( 2.2.22-8)
Recommends: file (=3.27-3)
Source: mirror:debian:pool/main/m/%n/%n_%v-1.tar.gz
Source-MD5: 17c162f96efff3574b2ba3346484fa92
SourceDirectory: %n
PatchScript: 
perl -pi -e 's,/usr,%p,g' debian/triggers mailcap.entries mailcap.order 
mailcap.order.man mailcap.man run-mailcap update-mime update-mime.man
perl -pi -e 's,/etc,%p/etc,g' mailcap.order.man run-mailcap.man update-mime
perl -pi -e 's,(|:)/etc,$1%p/etc,g' mailcap.man run-mailcap

## put /usr/local back
perl -pi -e 's,%p/local,/usr/local,g' debian/triggers mailcap.entries 
mailcap.order mailcap.order.man run-mailcap update-mime mailcap.man

## put /usr/bin/perl back
perl -pi -e 's,%p/bin/perl,/usr/bin/perl,g' run-mailcap update-mime

CompileScript: echo
InstallScript: 
#!/bin/sh -ev
install -d -m 0755 %i/etc %i/lib/mime/packages
install -d -m 0755 %i/share/doc/%n %i/sbin %i/bin
install -d -m 0755 %i/share/man/man1 %i/share/man/man5 %i/share/man/man8

install -m 644 mime.types %i/etc/
install -m 644 mailcap %i/lib/mime/
install -m 644 mailcap.order %i/etc/
install -m 644 mailcap.man %i/share/man/man5/mailcap.5
install -m 644 mailcap.order.man %i/share/man/man5/mailcap.order.5
install -m 755 update-mime %i/sbin/
install -m 644 update-mime.man %i/share/man/man8/update-mime.8
install -m 755 run-mailcap %i/bin/
install -m 644 run-mailcap.man %i/share/man/man1/run-mailcap.1
install -m 755 debian-view %i/lib/mime/
install -m 644 mailcap.entries %i/lib/mime/packages/mime-support

cd %i/bin; ln -s run-mailcap see
cd %i/bin; ln -s run-mailcap edit
cd %i/bin; ln -s run-mailcap compose
cd %i/bin; ln -s run-mailcap print
cd %i/share/man/man1; ln -s run-mailcap.1 see.1
cd %i/share/man/man1; ln -s run-mailcap.1 edit.1
cd %i/share/man/man1; ln -s run-mailcap.1 compose.1
cd %i/share/man/man1; ln -s run-mailcap.1 print.1

Triggers: 
  Interest-noawait: 
%p/lib/mime/packages
%p/share/applications
  

PostInstScript: 
set -e

# dpkg triggers support for update-mime
if [ $1 = triggered ]; then
test -x %p/sbin/update-mime  %p/sbin/update-mime --triggered
exit 0
fi


# Remove the old status directory (and any orphaned install-mime program)
rm -fr %p/var/lib/mime
rm -f  /%p/sbin/install-mime


# Use see as alternative for view
update-alternatives \
--install %p/bin/view view %p/bin/see 1 \
--slave %p/share/man/man1/view.1 view.1 %p/share/man/man1/see.1


# Run the update program
if [ -x %p/sbin/update-mime ]; then
%p/sbin/update-mime --triggered
fi

PreRmScript: 
set -e
# prerm file for mime-support

if [ \( $1 = upgrade -o $1 = remove \) -a -L %p/doc/mime-support ]; then
rm -f %p/doc/mime-support
fi

if [ $1 = remove ]; then
update-alternatives --remove view %p/bin/see
rm -f %p/etc/mailcap
fi

ConfFiles: %p/etc/mime.types %p/etc/mailcap.order
DocFiles: rfcs/* debian/changelog debian/README
Description: MIME files 'mime.types'  'mailcap'
DescDetail: 
As these files can be used by all MIME compliant programs, they have been moved
into their own package that others can depend upon.
.
Other packages add themselves as viewers/editors/composers/etc by using the
provided update-mime program.
.
In addition, the commands see, edit, compose, and pric by using 
theedr mailcap.order.man run-mailcap update-mime 
mailcap.mananàaz;ÿuêӑ+€
Ց+õ‘+’øð’+àaz;ÿ€“+ÐVz;ÿ
 Uz;ÿkԑ+6 
èè!è!paz;ÿàaz;ÿx´ð’+ÐWz;ÿ’âӑ+†Ô‘+paz;ÿ`âӑ+¯az;ÿÀ¯T“+uêӑ+
 T“+ؤT“+¨©T“+€
Ց+x´ð’+ÐWz;ÿ 
Vz;ÿkԑ+à!à!paz;ÿàaz;ÿH~В+°Xz;ÿ’âӑ+†Ô‘+paz;ÿ`âӑ+¯az;ÿ
 az;ÿ˜az;ÿ8õ‘+Œp˜àaz;ÿuêӑ+€
Ց+°Xz;ÿ€Wz;ÿkԑ+GHIJKMNOPpaz;ÿàaz;ÿH5§’+PZz;ÿ’âӑ+†Ô‘+paz;ÿ0¯T“+uêӑ+Àð’+
 i„’+ T“+ؤT“+¨©T“+€
Ց+H5§’+PZz;ÿXz;ÿkԑ+85§’+PZz;ÿÀXz;ÿkԑ+(5§’+PZz;ÿðXz;ÿkԑ+5§’+PZz;ÿ
 Yz;ÿkԑ+  ¨®T“+uêӑ+¨©T“+ 
Sz;ÿŠ¸„’+eéӑ+ؤT“+ÀYz;ÿy¸„’+eéӑ+
 T“+ðYz;ÿZ¸„’+eéӑ+Ød„’+Àð’+ i„’+ 
T“+ØÄð’+ؤT“+¨©T“+€

[cvs] experimental/thesin/finkinfo mime-support.info,1.1,1.2

2013-05-23 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26522

Modified Files:
mime-support.info 
Log Message:
Update to current version

Index: mime-support.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mime-support.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mime-support.info   23 May 2013 17:59:06 -  1.1
+++ mime-support.info   23 May 2013 18:07:38 -  1.2
@@ -1,14 +1,14 @@
 Package: mime-support
-Version: 3.52
+Version: 3.54
 Revision: 1.1
 Maintainer: Fink Core Group fink-c...@lists.sourceforge.net
-BuildDepends: fink (= 0.34.99.git)
+BuildDepends: fink (= 0.24.12-1)
 Conflicts: a2ps (4.10.4), metamail (2.7-44)
 Replaces: apache2-common ( 2.2.22-8), apache2.2-common ( 2.2.22-8)
 Recommends: file (=3.27-3)
-Source: mirror:debian:pool/main/m/%n/%n_%v-1.tar.gz
-Source-MD5: 17c162f96efff3574b2ba3346484fa92
-SourceDirectory: %n
+Source: mirror:debian:pool/main/m/%n/%n_%v.tar.gz
+Source-MD5: 61d4063cb612ecbac05cdd16145ca316
+SourceDirectory: %n-%v
 PatchScript: 
 perl -pi -e 's,/usr,%p,g' debian/triggers mailcap.entries mailcap.order 
mailcap.order.man mailcap.man run-mailcap update-mime update-mime.man
 perl -pi -e 's,/etc,%p/etc,g' mailcap.order.man run-mailcap.man update-mime
@@ -24,29 +24,35 @@
 InstallScript: 
 #!/bin/sh -ev
 install -d -m 0755 %i/etc %i/lib/mime/packages
-install -d -m 0755 %i/share/doc/%n %i/sbin %i/bin
+install -d -m 0755 %i/sbin %i/bin
 install -d -m 0755 %i/share/man/man1 %i/share/man/man5 %i/share/man/man8
 
 install -m 644 mime.types %i/etc/
-install -m 644 mailcap %i/lib/mime/
 install -m 644 mailcap.order %i/etc/
+
+install -m 755 run-mailcap %i/bin/
+ln -s %p/bin/run-mailcap %i/bin/compose
+ln -s %p/bin/run-mailcap %i/bin/edit
+ln -s %p/bin/run-mailcap %i/bin/print
+ln -s %p/bin/run-mailcap %i/bin/see
+
+install -m 755 debian-view %i/lib/mime/
+install -m 644 mailcap %i/lib/mime/
+
+install -m 755 update-mime %i/sbin/
+
+install -m 644 run-mailcap.man %i/share/man/man1/run-mailcap.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/compose.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/edit.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/print.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/see.1
+
 install -m 644 mailcap.man %i/share/man/man5/mailcap.5
 install -m 644 mailcap.order.man %i/share/man/man5/mailcap.order.5
-install -m 755 update-mime %i/sbin/
+
 install -m 644 update-mime.man %i/share/man/man8/update-mime.8
-install -m 755 run-mailcap %i/bin/
-install -m 644 run-mailcap.man %i/share/man/man1/run-mailcap.1
-install -m 755 debian-view %i/lib/mime/
-install -m 644 mailcap.entries %i/lib/mime/packages/mime-support
 
-cd %i/bin; ln -s run-mailcap see
-cd %i/bin; ln -s run-mailcap edit
-cd %i/bin; ln -s run-mailcap compose
-cd %i/bin; ln -s run-mailcap print
-cd %i/share/man/man1; ln -s run-mailcap.1 see.1
-cd %i/share/man/man1; ln -s run-mailcap.1 edit.1
-cd %i/share/man/man1; ln -s run-mailcap.1 compose.1
-cd %i/share/man/man1; ln -s run-mailcap.1 print.1
+install -m 644 mailcap.entries %i/lib/mime/packages/mime-support
 
 Triggers: 
   Interest-noawait: 
@@ -66,7 +72,7 @@
 
 # Remove the old status directory (and any orphaned install-mime program)
 rm -fr %p/var/lib/mime
-rm -f  /%p/sbin/install-mime
+rm -f  %p/sbin/install-mime
 
 
 # Use see as alternative for view
@@ -94,7 +100,7 @@
 fi
 
 ConfFiles: %p/etc/mime.types %p/etc/mailcap.order
-DocFiles: rfcs/* debian/changelog debian/README
+DocFiles: debian/changelog debian/copyright
 Description: MIME files 'mime.types'  'mailcap'
 DescDetail: 
 As these files can be used by all MIME compliant programs, they have been moved
@@ -108,4 +114,4 @@
 from the entries in the mime.types and mailcap files.
 
 Homepage: http://packages.debian.org/unstable/mime-support
-License: GPL
+License: Public Domain


--
Try New Relic Now  We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app,  servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/net mime-support.info,1.1,1.2

2013-05-22 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13029

Modified Files:
mime-support.info 
Log Message:
  * Media types:
  Added text/vnd.debian.copyright
  mime.types: removed duplicated lines.
  Correct application/smil to application/smil+xml.
  Added application/xslt+xml.
  Add the .opus file suffix to the audio/ogg media type.
  Add text/turtle media type. for .ttl files.
  Add image/jp2 media type for .jp2 and .jpg2 files.
  Removed the note on compression schemes (see RFC 6713).
  Display reportbug message suggesting to register types to the IANA.

  * Packaging
  Remove the RFC files, as they only contain a link to the Web.
  Do not make activating packages wait for pending triggers.
  Parse Desktop entries to generate mailcap entries.
Patch from Brian M. Carlson.
  Trigger update-mime for Desktop entry files added in
%p/share/applications.
  Mention Dpkg triggers in the manual page of update-mime.
  Renamed debian/README debian/copyright.
  Machine-readable copyright file.
  Disambiguate hyphens in manual pages.
  Corrected spelling error in a manual page.


Index: mime-support.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/mime-support.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mime-support.info   28 Jun 2012 16:46:14 -  1.1
+++ mime-support.info   22 May 2013 15:54:58 -  1.2
@@ -1,14 +1,14 @@
 Package: mime-support
-Version: 3.52
+Version: 3.54
 Revision: 1
 Maintainer: Fink Core Group fink-c...@lists.sourceforge.net
 BuildDepends: fink (= 0.24.12-1)
 Conflicts: a2ps (4.10.4), metamail (2.7-44)
 Replaces: apache2-common ( 2.2.22-8), apache2.2-common ( 2.2.22-8)
 Recommends: file (=3.27-3)
-Source: mirror:debian:pool/main/m/%n/%n_%v-1.tar.gz
-Source-MD5: 17c162f96efff3574b2ba3346484fa92
-SourceDirectory: %n
+Source: mirror:debian:pool/main/m/%n/%n_%v.tar.gz
+Source-MD5: 61d4063cb612ecbac05cdd16145ca316
+SourceDirectory: %n-%v
 PatchScript: 
 perl -pi -e 's,/usr,%p,g' debian/triggers mailcap.entries mailcap.order 
mailcap.order.man mailcap.man run-mailcap update-mime update-mime.man
 perl -pi -e 's,/etc,%p/etc,g' mailcap.order.man run-mailcap.man update-mime
@@ -23,34 +23,39 @@
 CompileScript: echo
 InstallScript: 
 #!/bin/sh -ev
-install -d -m 0755 %d/DEBIAN %i/etc %i/lib/mime/packages
-install -d -m 0755 %i/share/doc/%n %i/sbin %i/bin
+install -d -m 0755 %i/etc %i/lib/mime/packages
+install -d -m 0755 %i/sbin %i/bin
 install -d -m 0755 %i/share/man/man1 %i/share/man/man5 %i/share/man/man8
 
 install -m 644 mime.types %i/etc/
-install -m 644 mailcap %i/lib/mime/
 install -m 644 mailcap.order %i/etc/
+
+install -m 755 run-mailcap %i/bin/
+ln -s %p/bin/run-mailcap %i/bin/compose
+ln -s %p/bin/run-mailcap %i/bin/edit
+ln -s %p/bin/run-mailcap %i/bin/print
+ln -s %p/bin/run-mailcap %i/bin/see
+
+install -m 755 debian-view %i/lib/mime/
+install -m 644 mailcap %i/lib/mime/
+
+install -m 755 update-mime %i/sbin/
+
+install -m 644 run-mailcap.man %i/share/man/man1/run-mailcap.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/compose.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/edit.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/print.1
+ln -s %p/share/man/man1/run-mailcap.1 %i/share/man/man1/see.1
+
 install -m 644 mailcap.man %i/share/man/man5/mailcap.5
 install -m 644 mailcap.order.man %i/share/man/man5/mailcap.order.5
-install -m 755 update-mime %i/sbin/
+
 install -m 644 update-mime.man %i/share/man/man8/update-mime.8
-install -m 755 run-mailcap %i/bin/
-install -m 644 run-mailcap.man %i/share/man/man1/run-mailcap.1
-install -m 755 debian-view %i/lib/mime/
+
 install -m 644 mailcap.entries %i/lib/mime/packages/mime-support
 
+install -d -m 0755 %d/DEBIAN
 install -m 644 debian/triggers %d/DEBIAN/triggers
-
-cd %i/bin; ln -s run-mailcap see
-cd %i/bin; ln -s run-mailcap edit
-cd %i/bin; ln -s run-mailcap compose
-cd %i/bin; ln -s run-mailcap print
-cd %i/share/man/man1; ln -s run-mailcap.1 see.1
-cd %i/share/man/man1; ln -s run-mailcap.1 edit.1
-cd %i/share/man/man1; ln -s run-mailcap.1 compose.1
-cd %i/share/man/man1; ln -s run-mailcap.1 print.1
-
-cd %d  find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs md5sum  
%d/DEBIAN/md5sums
 
 PostInstScript: 
 set -e
@@ -64,7 +69,7 @@
 
 # Remove the old status directory (and any orphaned install-mime program)
 rm -fr %p/var/lib/mime
-rm -f  /%p/sbin/install-mime
+rm -f  %p/sbin/install-mime
 
 
 # Use see as alternative for view
@@ -92,7 +97,7 @@
 fi
 
 ConfFiles: %p/etc/mime.types %p/etc/mailcap.order
-DocFiles: rfcs/* debian/changelog debian/README
+DocFiles: debian/changelog debian/copyright
 Description: MIME files 'mime.types'  'mailcap'
 DescDetail: 
 As these files can be used by all MIME compliant programs, they have been moved
@@ -106,4 +111,4 @@
 from the entries in the mime.types and 

[cvs] experimental/thesin/finkinfo dpkg.info, 1.41, 1.42 dpkg.patch, 1.17, 1.18

2013-05-21 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20211

Modified Files:
dpkg.info dpkg.patch 
Log Message:
  * Fix the order to check for deps, dpkg then f-v-p, it was checking
f-v-p first which is wrong. Thanks Snaggle


Index: dpkg.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dpkg.patch  31 Oct 2012 15:20:36 -  1.17
+++ dpkg.patch  21 May 2013 20:49:24 -  1.18
@@ -1,6 +1,6 @@
-diff -ruN dpkg-1.16.9.orig/fink/md5sum dpkg-1.16.9/fink/md5sum
 dpkg-1.16.9.orig/fink/md5sum   1969-12-31 17:00:00.0 -0700
-+++ dpkg-1.16.9/fink/md5sum2012-07-02 16:14:45.0 -0600
+diff -ruN dpkg-1.16.10.orig/fink/md5sum dpkg-1.16.10/fink/md5sum
+--- dpkg-1.16.10.orig/fink/md5sum  1969-12-31 17:00:00.0 -0700
 dpkg-1.16.10/fink/md5sum   2012-07-02 16:14:45.0 -0600
 @@ -0,0 +1,313 @@
 +#!/usr/bin/perl
 +use strict;
@@ -315,16 +315,16 @@
 +}
[...1665 lines suppressed...]
-+ $output = _g(standard output);
-diff -ruN dpkg-1.16.9.orig/fink/patches/test-fix.patch 
dpkg-1.16.9/fink/patches/test-fix.patch
 dpkg-1.16.9.orig/fink/patches/test-fix.patch   1969-12-31 
17:00:00.0 -0700
-+++ dpkg-1.16.9/fink/patches/test-fix.patch2012-10-31 09:11:35.0 
-0600
++ sub extract_from_shlibs {
++@@ -694,7 +703,7 @@
++  next;
++  }
++  my $depread = defined($4) ? $4 : '';
++- if (($libname eq $2)  ($libversion eq $3)) {
+++ if (($libname eq $2 || $soname eq $2)  ($libversion eq $3)) {
++  # Define dep and end here if the package type explicitly
++  # matches. Otherwise if the packagetype is not specified, use
++  # the dep only as a default that can be overriden by a later
+diff -ruN dpkg-1.16.10.orig/fink/patches/test-fix.patch 
dpkg-1.16.10/fink/patches/test-fix.patch
+--- dpkg-1.16.10.orig/fink/patches/test-fix.patch  1969-12-31 
17:00:00.0 -0700
 dpkg-1.16.10/fink/patches/test-fix.patch   2012-10-31 09:11:35.0 
-0600
 @@ -0,0 +1,20 @@
 +diff -ruN dpkg-1.16.4.3.orig/src/t/100_dpkg_divert.t 
dpkg-1.16.4.3/src/t/100_dpkg_divert.t
 +--- dpkg-1.16.4.3.orig/src/t/100_dpkg_divert.t2012-06-13 
23:12:34.0 -0600

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dpkg.info   17 Apr 2013 16:00:11 -  1.41
+++ dpkg.info   21 May 2013 20:49:24 -  1.42
@@ -36,7 +36,7 @@
 Source-MD5: a20a06a5272717274a8b009368f237da
 
 PatchFile: dpkg.patch
-PatchFile-MD5: a9932d2527a62b1fb10196e24116a94c
+PatchFile-MD5: 76944f14e19764a76461b084c0cc8af9
 
 PatchScript: 
 sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1


--
Try New Relic Now  We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app,  servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debconf.info, 1.12, 1.13 debconf.patch, 1.3, 1.4

2013-05-15 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23376

Modified Files:
debconf.info debconf.patch 
Log Message:
  * KDE frontend: Work around multiple bugs in the perl code generated
by puic4. The frontend works again.
  * doc/Makefile: Avoid adding duplicated =encoding to pod files.
  * Moved love of the path fixed to the PatchScript and out of the PatchFile
for easier maintenance


Index: debconf.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debconf.patch   5 Apr 2013 19:52:23 -   1.3
+++ debconf.patch   15 May 2013 16:09:43 -  1.4
@@ -1,6 +1,6 @@
-diff -ruN debconf-1.5.43.orig/Debconf/Client/ConfModule.pm 
debconf-1.5.43/Debconf/Client/ConfModule.pm
 debconf-1.5.43.orig/Debconf/Client/ConfModule.pm   2011-02-01 
17:08:31.0 -0700
-+++ debconf-1.5.43/Debconf/Client/ConfModule.pm2012-06-29 
08:58:24.0 -0600
+diff -ruN debconf.orig/Debconf/Client/ConfModule.pm 
debconf/Debconf/Client/ConfModule.pm
+--- debconf.orig/Debconf/Client/ConfModule.pm  2013-04-07 11:53:12.0 
-0600
 debconf/Debconf/Client/ConfModule.pm   2013-05-15 09:12:24.0 
-0600
 @@ -73,9 +73,9 @@
$ENV{PERL_DL_NONLAZY}=1;
if (exists $ENV{DEBCONF_USE_CDEBCONF} and
@@ -31,9 +31,9 @@
  
[...1127 lines suppressed...]
-+++ debconf-1.5.43/samples/tutorial-back   2012-06-29 08:58:24.0 
-0600
+diff -ruN debconf.orig/samples/tutorial-back debconf/samples/tutorial-back
+--- debconf.orig/samples/tutorial-back 2013-04-07 11:53:12.0 -0600
 debconf/samples/tutorial-back  2013-05-15 09:53:06.0 -0600
 @@ -1,7 +1,7 @@
  #!/bin/sh -e
  
@@ -1272,9 +504,9 @@
  db_version 2.0
  
  # This conf script is capable of backing up
-diff -ruN debconf-1.5.43.orig/transition_db.pl debconf-1.5.43/transition_db.pl
 debconf-1.5.43.orig/transition_db.pl   2011-02-01 17:08:31.0 
-0700
-+++ debconf-1.5.43/transition_db.pl2012-06-29 08:58:24.0 -0600
+diff -ruN debconf.orig/transition_db.pl debconf/transition_db.pl
+--- debconf.orig/transition_db.pl  2013-04-07 11:53:12.0 -0600
 debconf/transition_db.pl   2013-05-15 09:53:34.0 -0600
 @@ -6,7 +6,7 @@
  use Debconf::Question;
  use Debconf::Template;

Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- debconf.info5 Apr 2013 21:32:53 -   1.12
+++ debconf.info15 May 2013 16:09:43 -  1.13
@@ -1,5 +1,5 @@
 Package: debconf
-Version: 1.5.49
+Version: 1.5.50
 Revision: 1
 Type: perl
 ###
@@ -35,12 +35,12 @@
 
 ###
 Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: cf2b9600849f2be083760e1eb33ba05c
-SourceDirectory: %n-%v
-TarFilesRename: debconf-1.5.49/debconf$:debconf-1.5.49/debconf.tmp
+Source-MD5: 99cfa20ec28c2af63f2e73b1347a52b6
+SourceDirectory: %n
+TarFilesRename: debconf/debconf$:debconf/debconf.tmp
 ###
 PatchFile: %n.patch
-PatchFile-MD5: 5d8fc8aff92b821c0950313e009e1401
+PatchFile-MD5: 9b6869ce0d082d35aec1966ea01f9628
 PatchScript: 
 sed 's|@FINKPREFIX@|%p|g'  %{PatchFile} | patch -p1
 
@@ -74,6 +74,16 @@
   perl -pi -e 's,/var,%p/var,g' $i; \
   perl -pi -e 's,/etc,%p/etc,g' $i; \
 done
+for i in %b/debian/po/*.po; do \
+  perl -pi -e 's,/usr,%p,g' $i; \
+  perl -pi -e 's,/var,%p/var,g' $i; \
+  perl -pi -e 's,/etc,%p/etc,g' $i; \
+done
+for i in %b/doc/README.LDAP %b/doc/TODO %b/doc/man/confmodule.3 
%b/doc/man/debconf-devel.7 %b/doc/man/debconf.7 %b/doc/man/debconf.conf.5 
%b/doc/man/po4a/po/debconf.pot %b/doc/namespace.txt; do \
+  perl -pi -e 's,/usr,%p,g' $i; \
+  perl -pi -e 's,/var,%p/var,g' $i; \
+  perl -pi -e 's,/etc,%p/etc,g' $i; \
+done
 
 ###
 CompileScript: 


--
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo mysql-server-5.5.info, 1.12, 1.13 mysql-server-5.5.patch, 1.8, 1.9

2013-05-14 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4705

Modified Files:
mysql-server-5.5.info mysql-server-5.5.patch 
Log Message:
  * New upstream release.
SECURITY UPDATE: CVE-2013-2375 CVE-2013-1544 CVE-2013-1532
CVE-2013-2389 CVE-2013-2392 CVE-2013-2376 CVE-2013-1511
CVE-2013-2391 CVE-2013-1502
- Patches refreshed.
- f/p/yassl.patch - dropped, applied upstream
- f/p/debian-mdev382-fixup.patch: dropped, fixed upstream.


Index: mysql-server-5.5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mysql-server-5.5.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mysql-server-5.5.info   17 Apr 2013 15:58:00 -  1.12
+++ mysql-server-5.5.info   14 May 2013 16:06:54 -  1.13
@@ -1,6 +1,6 @@
 Package: mysql-server-5.5
-Version: 5.5.30
-Revision: 1.2
+Version: 5.5.31
+Revision: 1.1
 ###
 BuildDepends: fink (= 0.34.99.git), dpkg (= 1.15), libncurses5 (= 5.0-6), 
readline6, po-debconf, cmake
 Depends: mysql-common (= %v-%r), mysql-client-5.5 (= %v-%r), 
mysql-server-core-5.5 (= %v-%r), libmysqlclient18-shlibs (= %v-%r), dbi-pm, 
daemonic, debconf
@@ -11,10 +11,10 @@
 ###
 Source: mirror:debian:/pool/main/m/mysql-5.5/mysql-5.5_%v+dfsg.orig.tar.gz
 SourceDirectory: mysql-5.5-%v+dfsg.orig
-Source-MD5: 9a80a5b54c0594b1e069069924d717b7
+Source-MD5: fa8d422a9cd6948dee7a9a7245c36b2f
 ###
 PatchFile: %n.patch
-PatchFile-MD5: dccee0d89569adb628845a1bf3247cff
+PatchFile-MD5: ec23f34df08d801cc30a3e36aedc4a68
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -29,8 +29,6 @@
   patch -p1  fink/patches/94_spelling.patch
   patch -p1  fink/patches/regex_plus.patch
   patch -p1  fink/patches/versioned_symbols.patch
-  patch -p1  fink/patches/debian-mdev382-fixup.patch
-  patch -p1  fink/patches/yassl.patch
 
   # Fix for darwin/fink
   patch -p1  fink/patches/cmake_readline_fix.patch

Index: mysql-server-5.5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mysql-server-5.5.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mysql-server-5.5.patch  17 Apr 2013 15:58:00 -  1.8
+++ mysql-server-5.5.patch  14 May 2013 16:06:54 -  1.9
@@ -1,6 +1,6 @@
-diff -ruN 
mysql-5.5-5.5.30+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in 
mysql-5.5-5.5.30+dfsg.orig/fink/additions/Docs__Images__Makefile.in
 mysql-5.5-5.5.30+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in   
1969-12-31 17:00:00.0 -0700
-+++ mysql-5.5-5.5.30+dfsg.orig/fink/additions/Docs__Images__Makefile.in
2012-07-12 15:48:13.0 -0600
+diff -ruN 
mysql-5.5-5.5.31+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in 
mysql-5.5-5.5.31+dfsg.orig/fink/additions/Docs__Images__Makefile.in
+--- mysql-5.5-5.5.31+dfsg.orig.orig/fink/additions/Docs__Images__Makefile.in   
1969-12-31 17:00:00.0 -0700
 mysql-5.5-5.5.31+dfsg.orig/fink/additions/Docs__Images__Makefile.in
2012-07-12 15:48:13.0 -0600
 @@ -0,0 +1,6 @@
 +all:
 +
@@ -8,9 +8,9 @@
 +  -rm -f Makefile
[...23768 lines suppressed...]
-+++ mysql-5.5-5.5.30+dfsg.orig/fink/po/templates.pot   2012-07-17 
08:17:32.0 -0600
+diff -ruN mysql-5.5-5.5.31+dfsg.orig.orig/fink/po/templates.pot 
mysql-5.5-5.5.31+dfsg.orig/fink/po/templates.pot
+--- mysql-5.5-5.5.31+dfsg.orig.orig/fink/po/templates.pot  1969-12-31 
17:00:00.0 -0700
 mysql-5.5-5.5.31+dfsg.orig/fink/po/templates.pot   2012-07-17 
08:17:32.0 -0600
 @@ -0,0 +1,187 @@
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -44826,9 +22352,9 @@
 +mysql-cluster-server package and remove all lines starting with \ndb\ from 

 +all config files below /etc/mysql/.
 +msgstr 
-diff -ruN mysql-5.5-5.5.30+dfsg.orig.orig/fink/po/tr.po 
mysql-5.5-5.5.30+dfsg.orig/fink/po/tr.po
 mysql-5.5-5.5.30+dfsg.orig.orig/fink/po/tr.po  1969-12-31 
17:00:00.0 -0700
-+++ mysql-5.5-5.5.30+dfsg.orig/fink/po/tr.po   2012-09-22 08:05:13.0 
-0600
+diff -ruN mysql-5.5-5.5.31+dfsg.orig.orig/fink/po/tr.po 
mysql-5.5-5.5.31+dfsg.orig/fink/po/tr.po
+--- mysql-5.5-5.5.31+dfsg.orig.orig/fink/po/tr.po  1969-12-31 
17:00:00.0 -0700
 mysql-5.5-5.5.31+dfsg.orig/fink/po/tr.po   2012-09-22 08:05:13.0 
-0600
 @@ -0,0 +1,358 @@
 +# Turkish translation of mysql-server.
 +# This file is distributed under the same license as the mysql-server package.


--
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one 

[cvs] dists/10.7/stable/main/finkinfo/web libjs-jquery-ui.info, 1.3, 1.4

2013-05-09 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25840

Modified Files:
libjs-jquery-ui.info 
Log Message:
 * Fix bad links


Index: libjs-jquery-ui.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/web/libjs-jquery-ui.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libjs-jquery-ui.info6 May 2013 17:53:37 -   1.3
+++ libjs-jquery-ui.info9 May 2013 23:59:27 -   1.4
@@ -1,6 +1,6 @@
 Package: libjs-jquery-ui
 Version: 1.10.1
-Revision: 1.1
+Revision: 1.2
 ###
 BuildDepends: yui-compressor
 Depends: javascript-common, libjs-jquery (= 1.6)
@@ -30,10 +30,10 @@
 cp -R %b/development-bundle/demos/* %i/share/doc/%N-docs/examples
 
 # links
-ln -s %p/share/javascript/jquery-ui/ui/$(basename 
%b/development-bundle/ui/jquery-ui-*.custom.js) 
%i/share/javascript/jquery-ui/jquery-ui.js
-ln -s %p/share/javascript/jquery-ui/ui/$(basename 
%b/development-bundle/ui/jquery-ui-*.custom.min.js) 
%i/share/javascript/jquery-ui/jquery-ui.min.js
-ln -s %p/share/javascript/jquery-ui/css/smoothness/$(basename 
%b/css/smoothness/jquery-ui-*.custom.css) 
%i/share/javascript/jquery-ui/css/smoothness/jquery-ui.css
-ln -s %p/share/javascript/jquery-ui/css/smoothness/$(basename 
%b/css/smoothness/jquery-ui-*.custom.min.css) 
%i/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css
+ln -s %p/share/javascript/jquery-ui/ui/$(basename 
%b/development-bundle/ui/jquery-ui*.custom.js) 
%i/share/javascript/jquery-ui/jquery-ui.js
+ln -s %p/share/javascript/jquery-ui/ui/$(basename 
%b/development-bundle/ui/jquery-ui*.custom.min.js) 
%i/share/javascript/jquery-ui/jquery-ui.min.js
+ln -s %p/share/javascript/jquery-ui/css/smoothness/$(basename 
%b/css/smoothness/jquery-ui*.custom.css) 
%i/share/javascript/jquery-ui/css/smoothness/jquery-ui.css
+ln -s %p/share/javascript/jquery-ui/css/smoothness/$(basename 
%b/css/smoothness/jquery-ui*.custom.min.css) 
%i/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css
 
 ###
 DocFiles: development-bundle/*.txt 


--
Learn Graph Databases - Download FREE O'Reilly Book
Graph Databases is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web swftools.patch, NONE, 1.1 swftools.info, 1.1, 1.2

2013-05-06 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14525

Modified Files:
swftools.info 
Added Files:
swftools.patch 
Log Message:
Fix a known x86 segfault bug


Index: swftools.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/swftools.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- swftools.info   23 Jul 2012 15:17:43 -  1.1
+++ swftools.info   6 May 2013 17:38:21 -   1.2
@@ -1,8 +1,10 @@
 Package: swftools
 Version: 0.9.2
-Revision: 1
+Revision: 2
 Source: http://www.swftools.org/%n-%v.tar.gz
 Source-MD5: 1055ebbe3b4cadcc71e83775a5a0906d
+Patchfile: %n.patch
+Patchfile-MD5: df36c48d880c039347c70e69cd52787f
 GCC: 4.0
 Maintainer: Christian Simon csi...@ccr.jussieu.fr
 HomePage: http://www.swftools.org

--- NEW FILE: swftools.patch ---
diff -ruN swftools-0.9.2.orig/lib/as3/registry.c 
swftools-0.9.2/lib/as3/registry.c
--- swftools-0.9.2.orig/lib/as3/registry.c  2010-11-12 11:55:21.0 
-0700
+++ swftools-0.9.2/lib/as3/registry.c   2013-05-06 11:26:18.0 -0600
@@ -538,13 +538,13 @@
 
 // --- builtin dummy types -
 classinfo_t nullclass = {
-INFOTYPE_CLASS,0,0,ACCESS_PACKAGE, , null, 0, 0, 0
+INFOTYPE_CLASS,0,0,ACCESS_PACKAGE, , null, 0,0,0,0,0,0,0,0,0,0,0,0,0,
 };
 classinfo_t* registry_getnullclass() {
 return nullclass;
 }
 classinfo_t voidclass = {
-INFOTYPE_CLASS,0,0,ACCESS_PACKAGE, , void, 0, 0, 0
+INFOTYPE_CLASS,0,0,ACCESS_PACKAGE, , void, 0,0,0,0,0,0,0,0,0,0,0,0,0,
 };
 classinfo_t* registry_getvoidclass() {
 return voidclass;


--
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with 2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo php5.info, 1.11, 1.12 php5.patch, 1.8, 1.9

2013-05-06 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15088

Modified Files:
php5.info php5.patch 
Log Message:
  * [CVE-2013-1824]: CVE-2013-1643 had incomplete fix for external entity
loading


Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- php5.info   7 Mar 2013 21:21:08 -   1.11
+++ php5.info   6 May 2013 17:52:07 -   1.12
@@ -1,7 +1,7 @@
 Info2: 
 Package: php5
 Version: 5.4.4
-Revision: 14.1
+Revision: 15.1
 Type: sapiver (20100525)
 ###
 BuildDepends: fink (= 0.34.99.git), automake1.11, apache2-prefork-dev, 
aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, expat1, 
file-dev, freetds (= 1:0.91-1), freetds-dev, freetype219, gd2, glib2-dev, 
gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, libgcrypt, 
libicu36-dev, libjpeg8, libmcrypt, libmhash2, libonig2-dev, libodbc3-dev, 
libpcre1, libpng15, libtidy-0.99.0-dev, libtool2, libxml2, libxslt, 
mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, netcat, 
openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, recode-dev, 
sed, sqlite3-dev, wrap
@@ -69,7 +69,7 @@
 Source: mirror:custom:distributions/php-%v.tar.gz
 Source-MD5: 8366c3626f2275ab8c7ef5e2d6bc5bd7
 PatchFile: %n.patch
-PatchFile-MD5: b9637a9aeabc3879242fe37df492c992
+PatchFile-MD5: 450807d4fa22c773daff254dbfd4656e
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -139,7 +139,7 @@
   patch -p1  
fink/patches/session.c_rfc1867_crashes_php_even_though_turned_off.patch
   patch -p1  
fink/patches/php-5.4.11-session-reset-global-var-in-shutdown.patch
   patch -p1  fink/patches/CVE-2013-1635.patch
-  patch -p1  fink/patches/CVE-2013-1643.patch
+  patch -p1  fink/patches/CVE-2013-1824.patch
 
   patch -p1  fink/patches/giconv_is_inferior.patch
   patch -p1  fink/patches/gd-libJPEG-Version.patch

Index: php5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- php5.patch  7 Mar 2013 21:21:09 -   1.8
+++ php5.patch  6 May 2013 17:52:07 -   1.9
@@ -263,10 +263,64 @@
 +   cache_dir, zend_soap_globals, soap_globals)
 + STD_PHP_INI_ENTRY(soap.wsdl_cache_ttl, 86400, PHP_INI_ALL, 
OnUpdateLong,
 +   cache_ttl, zend_soap_globals, soap_globals)
-diff -ruN php-5.4.4.orig/fink/patches/CVE-2013-1643.patch 
php-5.4.4/fink/patches/CVE-2013-1643.patch
 php-5.4.4.orig/fink/patches/CVE-2013-1643.patch1969-12-31 
17:00:00.0 -0700
-+++ php-5.4.4/fink/patches/CVE-2013-1643.patch 2013-03-07 10:22:52.0 
-0700
-@@ -0,0 +1,135 @@
+diff -ruN php-5.4.4.orig/fink/patches/CVE-2013-1824.patch 
php-5.4.4/fink/patches/CVE-2013-1824.patch
+--- php-5.4.4.orig/fink/patches/CVE-2013-1824.patch1969-12-31 
17:00:00.0 -0700
 php-5.4.4/fink/patches/CVE-2013-1824.patch 2013-05-06 09:30:39.0 
-0600
+@@ -0,0 +1,142 @@
++--- a/ext/soap/php_xml.c
+ b/ext/soap/php_xml.c
++@@ -20,6 +20,7 @@
++ /* $Id$ */
++ 
++ #include php_soap.h
+++#include ext/libxml/php_libxml.h
++ #include libxml/parser.h
++ #include libxml/parserInternals.h
++ 
++@@ -91,13 +92,17 @@ xmlDocPtr soap_xmlParseFile(const char *
++  ctxt = xmlCreateFileParserCtxt(filename);
++  PG(allow_url_fopen) = old_allow_url_fopen;
++  if (ctxt) {
+++ zend_bool old;
+++
++  ctxt-keepBlanks = 0;
++  ctxt-sax-ignorableWhitespace = soap_ignorableWhitespace;
++  ctxt-sax-comment = soap_Comment;
++  ctxt-sax-warning = NULL;
++  ctxt-sax-error = NULL;
++  /*ctxt-sax-fatalError = NULL;*/
+++ old = php_libxml_disable_entity_loader(1 TSRMLS_CC);
++  xmlParseDocument(ctxt);
+++ php_libxml_disable_entity_loader(old TSRMLS_CC);
++  if (ctxt-wellFormed) {
++  ret = ctxt-myDoc;
++  if (ret-URL == NULL  ctxt-directory != NULL) {
++@@ -128,11 +133,15 @@ xmlDocPtr soap_xmlParseMemory(const void
++  xmlParserCtxtPtr ctxt = NULL;
++  xmlDocPtr ret;
++ 
+++ TSRMLS_FETCH();
+++
++ /*
++  xmlInitParser();
++ */
++  ctxt = xmlCreateMemoryParserCtxt(buf, buf_size);
++  if (ctxt) {
+++ zend_bool old;
+++
++  ctxt-sax-ignorableWhitespace = soap_ignorableWhitespace;
++  ctxt-sax-comment = soap_Comment;
++  ctxt-sax-warning = NULL;
++@@ -141,7 +150,9 @@ xmlDocPtr soap_xmlParseMemory(const void
++ #if LIBXML_VERSION = 20703
++  ctxt-options |= XML_PARSE_HUGE;
++ #endif
+++ old = php_libxml_disable_entity_loader(1 TSRMLS_CC);
++  

[cvs] dists/10.7/stable/main/finkinfo/web libjs-swfupload.info, NONE, 1.1 libjs-swfupload.patch, NONE, 1.1

2013-05-06 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15322

Added Files:
libjs-swfupload.info libjs-swfupload.patch 
Log Message:
 * New port


--- NEW FILE: libjs-swfupload.info ---
Package: libjs-swfupload
Version: 2.2.0.1
Revision: 2.1
###
BuildDepends: swftools (= 0.9.2-2)
###
Source: mirror:debian:/pool/main/libj/%n/%n_%v+ds1.orig.tar.gz
Source-MD5: 37408becdc0a93f4dbc0e500b208db98
SourceDirectory: %n_%v+ds1
PatchFile: %n.patch
PatchFile-MD5: 50f5902f1758bbdd15c149f9b1f4e623
PatchScript: 
  sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1

  ### Apply some Debian Patches for Security and Build Issues
  patch -p1  fink/patches/fix-CVE-2012-2399-xss.patch
  patch -p1  fink/patches/fix-externalcall.patch

  ### Remove spaces
  mv Core\ Changelog.txt Changelog.txt
  mv swfupload\ license.txt license.txt

###
CompileScript: 
cd Flash  as3compile -M SWFUpload -T 9 -X 300 -Y 300 -r 15 SWFUpload.as -o 
swfupload.swf
mv Flash/swfupload.swf swfupload.swf

InstallScript: 
install -d -m 755 %i/share/javascript/swfupload
install -d -m 755 %i/share/javascript/swfupload/plugins

install -m 644 swfupload.js swfupload.swf %i/share/javascript/swfupload
install -m 644 plugins/* %i/share/javascript/swfupload/plugins

###
DocFiles: Changelog.txt license.txt Documentation/index.html
###
Description: JS lib to use Flash's upload functionality
DescDetail: 
SWFUpload is a JavaScript Library that wraps the Flash Player's upload
function. It brings your uploads to the next level with Multiple File
Selection, Upload Progress and Client-side File Size Checking.
.
Unlike other Flash upload tools, SWFUpload leaves the UI in the developer's
hands. Using a set of event handlers developers can display upload progress
and status to the user in their own HTML/CSS UI.
.
Features:
 * Multiple File Selection
 * File Upload Progress
 * Custom Limits for File Size and Number of Uploads
 * Filter by File Type ie. *.jpg
 * File Queue
 * Customize the Browse Control
 * Flash 10 Support

###
License: BSD
Homepage: http://code.google.com/p/swfupload/
Maintainer: Justin F. Hallett the...@users.sourceforge.net

--- NEW FILE: libjs-swfupload.patch ---
diff -ruN 
libjs-swfupload_2.2.0.1+ds1.orig/fink/patches/fix-CVE-2012-2399-xss.patch 
libjs-swfupload_2.2.0.1+ds1/fink/patches/fix-CVE-2012-2399-xss.patch
--- libjs-swfupload_2.2.0.1+ds1.orig/fink/patches/fix-CVE-2012-2399-xss.patch   
1969-12-31 17:00:00.0 -0700
+++ libjs-swfupload_2.2.0.1+ds1/fink/patches/fix-CVE-2012-2399-xss.patch
2013-05-06 11:11:43.0 -0600
@@ -0,0 +1,11 @@
+diff -ruN libjs-swfupload_2.2.0.1+ds1.orig/Flash/SWFUpload.as 
libjs-swfupload_2.2.0.1+ds1.patched/Flash/SWFUpload.as
+--- libjs-swfupload_2.2.0.1+ds1.orig/Flash/SWFUpload.as2009-03-27 
04:15:10.0 -0600
 libjs-swfupload_2.2.0.1+ds1.patched/Flash/SWFUpload.as 2013-05-06 
11:11:27.0 -0600
+@@ -232,6 +232,7 @@
+   

+   // Get the movie name

+   this.movieName = root.loaderInfo.parameters.movieName;

++  this.movieName = 
this.movieName.replace(/[^a-zA-Z0-9\_\.\-]/g, );

+ 

+   // **Configure the callbacks**

+   // The JavaScript tracks all the instances of SWFUpload 
on a page.  We can access the instance

diff -ruN libjs-swfupload_2.2.0.1+ds1.orig/fink/patches/fix-externalcall.patch 
libjs-swfupload_2.2.0.1+ds1/fink/patches/fix-externalcall.patch
--- libjs-swfupload_2.2.0.1+ds1.orig/fink/patches/fix-externalcall.patch
1969-12-31 17:00:00.0 -0700
+++ libjs-swfupload_2.2.0.1+ds1/fink/patches/fix-externalcall.patch 
2013-05-06 11:13:28.0 -0600
@@ -0,0 +1,19 @@
+diff -ruN libjs-swfupload_2.2.0.1+ds1.orig/Flash/ExternalCall.as 
libjs-swfupload_2.2.0.1+ds1.patched/Flash/ExternalCall.as
+--- libjs-swfupload_2.2.0.1+ds1.orig/Flash/ExternalCall.as 2009-03-27 
04:16:56.0 -0600
 libjs-swfupload_2.2.0.1+ds1.patched/Flash/ExternalCall.as  2013-05-06 
11:13:00.0 -0600
+@@ -99,7 +99,7 @@
+   }

+   

+   private static function EscapeString(message:String):String {

+-  var replacePattern:RegExp = /\\/g; //new RegExp(/\\/, 
g);

++  var replacePattern:RegExp = /\\/g;

+   return message.replace(replacePattern, );

+   }

+   private static function EscapeArray(message_array:Array):Array {

+@@ -118,4 +118,4 @@
+   }

+ 

+   }

+-}
+\ No newline at end of file
++}



--
Learn Graph Databases - Download FREE O'Reilly Book
Graph Databases is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now

[cvs] dists/10.7/stable/main/finkinfo/devel ocaml-extlib.info, 1.2, 1.3

2013-05-06 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23432

Modified Files:
ocaml-extlib.info 
Log Message:
 * New upstream release
 * Now compiles on 10.8
 * touch css file since the build system doesn't create it but expects it to
   be there
 * Okay from maintainer to update


Index: ocaml-extlib.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/ocaml-extlib.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ocaml-extlib.info   18 Apr 2013 06:22:40 -  1.2
+++ ocaml-extlib.info   6 May 2013 19:20:24 -   1.3
@@ -1,10 +1,10 @@
 Package: ocaml-extlib
-Version: 1.5.2
+Version: 1.5.3
 Revision: 1
 
 Source: http://ocaml-extlib.googlecode.com/files/extlib-%v.tar.gz
 SourceDirectory: extlib-%v
-Source-MD5: 839f9bf5a971fa07935c96ba7e209f86
+Source-MD5: 3de5f4e0a95fda7b2f3819c4a655b17c
 
 Depends: ocaml, ocaml-findlib
 
@@ -13,6 +13,7 @@
  ExtLib is released under the same license as the OCaml Standard Library
 
 CompileScript: 
+ touch odoc_style.css
  mkdir out
  ocaml install.ml -b -n -doc -d out
 


--
Learn Graph Databases - Download FREE O'Reilly Book
Graph Databases is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/devel mtasc.info, NONE, 1.1 mtasc.patch, NONE, 1.1

2013-05-06 Thread Justin F. Hallett
.$(A) -I 
.. -I ../extc as3.mli as3code.ml as3parse.ml swf.ml swfZip.ml actionScript.ml 
swfParser.ml
++  ( cd ocaml/mtasc ; ocamllex lexer.mll ; ocamlfind $(C) -c expr.ml 
lexer.ml ; ocamlfind $(C) -c -pp $(CP) parser.ml ;\
++  ocamlfind $(C) -package extlib -c -I .. -I ../extc -I ../swflib 
typer.ml class.ml plugin.ml genSwf.ml main.ml ;\
++  ocamlfind $(C) -package extlib -linkpkg $(CU) -o mtasc -cclib $(ZLIB) 
../extc/extc.$(A) ../swflib/swflib.$(A) expr.$(O) lexer.$(O) parser.$(O) 
typer.$(O) class.$(O) plugin.$(O) genSwf.$(O) main.$(O) )
+ 
+ clean:
+   rm -f ocaml/*/*.cma ocaml/*/*.cmi ocaml/*/*.cmo ocaml/*/*.cmx
+@@ -16,9 +26,9 @@
+   rm -f ocaml/mtasc/lexer.ml ocaml/mtasc/mtasc
+ 
+ install:
+-  mkdir -p $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/share/
++  mkdir -p $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/share/mtasc/
+   cp ocaml/mtasc/mtasc $(DESTDIR)$(PREFIX)/bin/
+-  cp -r ocaml/mtasc/std $(DESTDIR)$(PREFIX)/share/
+-  cp -r ocaml/mtasc/std8 $(DESTDIR)$(PREFIX)/share/
++  cp -r ocaml/mtasc/std $(DESTDIR)$(PREFIX)/share/mtasc/
++  cp -r ocaml/mtasc/std8 $(DESTDIR)$(PREFIX)/share/mtasc/
+ 
+ .PHONY: build install clean

--- NEW FILE: mtasc.info ---
Package: mtasc
Version: 1.14
Revision: 2.1
###
Depends: ocaml, ocaml-findlib, ocaml-extlib
###
Source: mirror:debian:/pool/main/m/%n/%n_%v.orig.tar.gz
Source-MD5: 477055c2d2f5856ae346d04a7cc53f26
SourceDirectory: %n-%v
PatchFile: %n.patch
PatchFile-MD5: a34d5901d349852feb106ad11e019c96
PatchScript: 
  sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1

  ### Apply some Debian Patches for Security and Build Issues
  patch -p1  fink/patches/exe_in_usage.patch
  patch -p1  fink/patches/makefile_kludges.patch
  patch -p1  fink/patches/include_dirs.patch
  patch -p1  fink/patches/fix_mtasc_for_camlp4_3.11.0.patch
  patch -p1  fink/patches/extc-fixes.patch 

###
CompileScript: 
make -f ocaml/mtasc/doc/Makefile C=ocamlopt O=cmx A=cmxa CU= CP=camlp4o

InstallScript: 
#install -d -m 755 %i/share/mtasc/std
#install -d -m 755 %i/share/mtasc/std8

make -f ocaml/mtasc/doc/Makefile install PREFIX=%p DESTDIR=%d

# fix so mtasc is usabled by fink-bld
for i in `find %i/share -type f -print`; do echo $i; chmod 644 $i; done
for i in `find %i/share -type d -print`; do echo $i; chmod 755 $i; done

# examples
install -d -m 755 %i/share/doc/%n/examples
install -m 644 ocaml/mtasc/doc/HelloWorld.as %i/share/doc/%n/examples

###
InfoTest: 
  TestScript: 
#!/bin/sh -ex
./ocaml/mtasc/mtasc -v -swf helloworld.swf -main -header 640:480:20 
ocaml/mtasc/doc/HelloWorld.as || exit 2
./ocaml/mtasc/mtasc -version 8 -v -swf helloworld.swf -main -header 640:480:20 
ocaml/mtasc/doc/HelloWorld.as || exit 2
  

###
DocFiles: ocaml/mtasc/doc/CHANGES.txt ocaml/mtasc/doc/Future.txt ChangeLog 
ocaml/mtasc/LICENSE
###
Description: ActionScript 2 to Flash (SWF) compiler
DescDetail: 
MTASC is the first ActionScript 2 Open Source free compiler. It can compile
large numbers of .as class files in a very short time and generate directly
the corresponding SWF bytecode.

DescUsage: 
Sysadmins can override the installed headers by placing files in
%p/share/mtasc/ and the std and std8 subdirectories.

###
License: GPL
Homepage: http://www.mtasc.org
Maintainer: Justin F. Hallett the...@users.sourceforge.net


--
Learn Graph Databases - Download FREE O'Reilly Book
Graph Databases is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web libjs-swfobject.info, NONE, 1.1 libjs-swfobject.patch, NONE, 1.1 libjs-swfupload.info, 1.1, 1.2

2013-05-06 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28617

Modified Files:
libjs-swfupload.info 
Added Files:
libjs-swfobject.info libjs-swfobject.patch 
Log Message:
libjs-swfobject
 * New Port

libjs-swfupload
 * Add depends on javascript-common


--- NEW FILE: libjs-swfobject.info ---
Package: libjs-swfobject
Version: 2.2
Revision: 1.1
###
BuildDepends: yui-compressor, mtasc
Depends: javascript-common
###
Source: mirror:debian:/pool/main/libj/%n/%n_%v+dfsg.orig.tar.gz
Source-MD5: c0bbb91b7a278b93aa908d3a22f49cc3
SourceDirectory: swfobject
PatchFile: %n.patch
PatchFile-MD5: 4910f9c69f93bf4e08f7394f3c26edab
PatchScript: 
  sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1

  ### Apply some Debian Patches for Security and Build Issues
  patch -p1  fink/patches/expressInstall-AS2.patch

###
CompileScript: 
mkdir build
mtasc -v -main -header 310:130:12 -version 6 -out build/expressInstall.swf -swf 
build/expressInstall.swf src/expressInstall.as
yui-compressor src/swfobject.js -o build/swfobject.js

InstallScript: 
install -d -m 755 %i/share/javascript/swfobject
install -m 644 build/swfobject.js %i/share/javascript/swfobject
install -m 644 build/expressInstall.swf %i/share/javascript/swfobject

# examples
install -d -m 755 %i/share/doc/%n/examples
install -m 644 index.html %i/share/doc/%n/examples
install -m 644 index_dynamic.html %i/share/doc/%n/examples

###
Description: Tool to embed Flash content into webpages
DescDetail: 
SWFObject is an easy-to-use and standards-friendly method to embed Flash
content, which utilizes one small JavaScript file.
.
 * it offers two optimized Flash Player embed methods; a markup based
   approach and a method that relies on JavaScript
 * it offers a JavaScript API that aims to provide a complete tool set for
   embedding SWF files and retrieving Flash Player related information
 * it utilizes only one small JavaScript file (10Kb / GZIPed: 3.9Kb)
 * it is the successor of SWFObject 1.5, UFO and the Adobe Flash Player
   Detection Kit
 * it intends to unify all existing Flash Player embed methods and provide a
   new standard for embedding Adobe Flash Player content 

###
License: BSD
Homepage: http://code.google.com/p/swfobject/
Maintainer: Justin F. Hallett the...@users.sourceforge.net

Index: libjs-swfupload.info
===
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/web/libjs-swfupload.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libjs-swfupload.info6 May 2013 17:55:24 -   1.1
+++ libjs-swfupload.info6 May 2013 21:02:43 -   1.2
@@ -1,8 +1,9 @@
 Package: libjs-swfupload
 Version: 2.2.0.1
-Revision: 2.1
+Revision: 2.2
 ###
 BuildDepends: swftools (= 0.9.2-2)
+Depends: javascript-common
 ###
 Source: mirror:debian:/pool/main/libj/%n/%n_%v+ds1.orig.tar.gz
 Source-MD5: 37408becdc0a93f4dbc0e500b208db98

--- NEW FILE: libjs-swfobject.patch ---
diff -ruN swfobject.orig/fink/patches/expressInstall-AS2.patch 
swfobject/fink/patches/expressInstall-AS2.patch
--- swfobject.orig/fink/patches/expressInstall-AS2.patch1969-12-31 
17:00:00.0 -0700
+++ swfobject/fink/patches/expressInstall-AS2.patch 2013-05-06 
13:26:06.0 -0600
@@ -0,0 +1,170 @@
+From: Christian Welzel gaw...@camlann.de
+Subject: Port ActionScript-1 code to ActionScript-2 for mtasc
+Origin: http://code.google.com/p/swfobject/issues/detail?id=233
+Description: Debian policy requires all packages in main to be compiled
+ with tools in main. For compiling ActionScript code there is only mtasc
+ available. But mtasc can only process ActionScript 2 code. So this patch
+ ports the upstream AS1 code to AS2 code to allow to compile it with mtasc.
+ The patch was orignally written by a guy named Kyle and published in the 
+ mentioned origin.
+
+--- libjs-swfobject-2.2.orig/src/expressInstall.as
 libjs-swfobject-2.2/src/expressInstall.as
+@@ -1,70 +1,87 @@
+-/*SWFObject v2.2 http://code.google.com/p/swfobject/ is released under 
the MIT License http://www.opensource.org/licenses/mit-license.php
+-  Express Install Copyright (c) 2007-2008 Adobe Systems Incorporated and 
its licensors. All Rights Reserved.
+-*/
+-
+-System.security.allowDomain(fpdownload.macromedia.com);
+-
+-var time = 0;
+-var timeOut = 5; // in seconds
+-var delay = 10; // in milliseconds
+-var int_id = setInterval(checkLoaded, delay);
+-var old_si = null;
+-var loaderClip = this.createEmptyMovieClip(loaderClip, 0);
+-var updateSWF = 
http://fpdownload.macromedia.com/pub/flashplayer/update/current/swf/autoUpdater.swf?;
 + Math.random();
+-loaderClip.loadMovie(updateSWF);
+-
+-function checkLoaded(){
+-  time += delay / 1000;
+-  if (time  timeOut) {
+-  // updater did not load in time, abort load and force 
alternative content
+-  clearInterval(int_id

[cvs] experimental/thesin/finkinfo mysql-server-5.5.info, 1.11, 1.12 mysql-server-5.5.patch, 1.7, 1.8

2013-04-17 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26067

Modified Files:
mysql-server-5.5.info mysql-server-5.5.patch 
Log Message:
  * f/p/yassl.patch - patch for CVE-2013-0169


Index: mysql-server-5.5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mysql-server-5.5.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mysql-server-5.5.info   2 Apr 2013 16:28:53 -   1.11
+++ mysql-server-5.5.info   17 Apr 2013 15:58:00 -  1.12
@@ -1,6 +1,6 @@
 Package: mysql-server-5.5
 Version: 5.5.30
-Revision: 1.1
+Revision: 1.2
 ###
 BuildDepends: fink (= 0.34.99.git), dpkg (= 1.15), libncurses5 (= 5.0-6), 
readline6, po-debconf, cmake
 Depends: mysql-common (= %v-%r), mysql-client-5.5 (= %v-%r), 
mysql-server-core-5.5 (= %v-%r), libmysqlclient18-shlibs (= %v-%r), dbi-pm, 
daemonic, debconf
@@ -14,7 +14,7 @@
 Source-MD5: 9a80a5b54c0594b1e069069924d717b7
 ###
 PatchFile: %n.patch
-PatchFile-MD5: cf07395abf03051e36a6ea74915b35b0
+PatchFile-MD5: dccee0d89569adb628845a1bf3247cff
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -30,6 +30,7 @@
   patch -p1  fink/patches/regex_plus.patch
   patch -p1  fink/patches/versioned_symbols.patch
   patch -p1  fink/patches/debian-mdev382-fixup.patch
+  patch -p1  fink/patches/yassl.patch
 
   # Fix for darwin/fink
   patch -p1  fink/patches/cmake_readline_fix.patch

Index: mysql-server-5.5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/mysql-server-5.5.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mysql-server-5.5.patch  2 Apr 2013 16:28:53 -   1.7
+++ mysql-server-5.5.patch  17 Apr 2013 15:58:00 -  1.8
@@ -39040,6 +39040,478 @@
 + ENDIF() 
 + # clean direct output needs to be set several targets have the same name
 + #(mysqlclient in this case)
+diff -ruN mysql-5.5-5.5.30+dfsg.orig.orig/fink/patches/yassl.patch 
mysql-5.5-5.5.30+dfsg.orig/fink/patches/yassl.patch
+--- mysql-5.5-5.5.30+dfsg.orig.orig/fink/patches/yassl.patch   1969-12-31 
17:00:00.0 -0700
 mysql-5.5-5.5.30+dfsg.orig/fink/patches/yassl.patch2013-04-17 
08:25:54.0 -0600
+@@ -0,0 +1,468 @@
++Author: Michael Stapelberg stapelb...@debian.org
++Origin: http://www.yassl.com/
++Forwarded: no
++Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699886
++Description: Fixes CVE-2013-0169
++ MySQL uses yaSSL 2.2.2. yaSSL has released version 2.2.2d which addresses 
this
++ problem. I applied the patch to MySQL, see bug 699886 for details.
++
++Index: mysql-5.5-5.5.30+dfsg/extra/yassl/include/openssl/ssl.h
++===
++--- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/include/openssl/ssl.h  
2013-01-16 08:35:17.0 +0100
+ mysql-5.5-5.5.30+dfsg/extra/yassl/include/openssl/ssl.h   2013-04-14 
13:15:17.402046571 +0200
++@@ -35,7 +35,7 @@
++ #include rsa.h
++ 
++ 
++-#define YASSL_VERSION 2.2.2
+++#define YASSL_VERSION 2.2.2d
++ 
++ 
++ #if defined(__cplusplus)
++Index: mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_error.hpp
++===
++--- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/include/yassl_error.hpp
2013-01-16 08:35:17.0 +0100
+ mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_error.hpp 2013-04-14 
13:15:17.402046571 +0200
++@@ -53,7 +53,8 @@
++ badVersion_error= 117,
++ compress_error  = 118,
++ decompress_error= 119,
++-pms_version_error   = 120
+++pms_version_error   = 120,
+++sanityCipher_error  = 121
++ 
++ //  add error message to .cpp 
++ 
++Index: mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_types.hpp
++===
++--- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/include/yassl_types.hpp
2013-01-16 08:35:17.0 +0100
+ mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_types.hpp 2013-04-14 
13:15:17.403046590 +0200
++@@ -220,7 +220,11 @@
++ const int MAX_RECORD_SIZE   = 16384; // 2^14, max size by standard
++ const int COMPRESS_EXTRA= 1024;  // extra compression possible addition
++ const int SESSION_FLUSH_COUNT = 256;  // when to flush session cache
++-
+++const int MAX_PAD_SIZE= 256;  // max TLS padding size
+++const int COMPRESS_CONSTANT   =  13;  // compression calculation constant
+++const int COMPRESS_UPPER  =  55;  // compression calculation numerator
+++const int COMPRESS_LOWER  =  64;  // compression calculation denominator
+++const int COMPRESS_DUMMY_SIZE =  64;  // compression dummy round size 
++ 
++ typedef uint8 Cipher; // first byte is always 0x00 for SSLv3  
TLS
++ 
++Index: 

[cvs] experimental/thesin/finkinfo dpkg.info,1.40,1.41

2013-04-17 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26344

Modified Files:
dpkg.info 
Log Message:
Fix wildcard locale dir installs

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dpkg.info   5 Apr 2013 19:05:44 -   1.40
+++ dpkg.info   17 Apr 2013 16:00:11 -  1.41
@@ -84,6 +84,11 @@
 
 # Fix for older gcc ie: 10.5
 perl -pi -e 's,-Wvla ,,g' configure
+
+# Move dselect and dpkg-dev locals for cleaner Install Phases
+perl -pi -e 's,localedir = \$\(datadir\)\/locale,localedir = 
\$(datadir)/locale-dselect,g' dselect/Makefile.in
+perl -pi -e 's,localedir = \@localedir\@,localedir = \@localedir\@-dselect,g' 
dselect/po/Makefile.in.in
+perl -pi -e 's,localedir = \@localedir\@,localedir = \@localedir\@-perl,g' 
scripts/Makefile.in scripts/po/Makefile.in.in
 
 
 SetCFLAGS: -I%p/include -F/System/Library/Frameworks/CoreFoundation.framework 
-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers 
-Wno-cast-align -Wno-format-security
@@ -700,7 +705,6 @@
 bin/dpkg-source
 bin/dpkg-vendor
 share/dpkg/*.mk
-share/locale/*/LC_MESSAGES/dpkg-dev.mo
 share/man/man1/dpkg-architecture.1
 share/man/man1/dpkg-buildflags.1
 share/man/man1/dpkg-buildpackage.1
@@ -753,9 +757,13 @@
   Essential: yes
   Files: 
 lib/dpkg/parsechangelog
-share/man/man3
 lib/perl5/Dpkg
 lib/perl5/Dpkg.pm
+share/man/man3
+  
+  InstallScript: 
+mkdir -p %i/share
+mv %I/share/locale-perl %i/share/locale
   
   DocFiles: AUTHORS THANKS doc/README.api doc/README.feature-removal-schedule
   Description: Dpkg perl modules
@@ -810,11 +818,14 @@
 etc/dpkg/dselect.cfg.d
 bin/dselect
 lib
-share/locale/*/LC_MESSAGES/dselect.mo
 share/man/man1/dselect.1
 var/lib/dpkg/methods
 share/man/man5/dselect.cfg.5
   
+  InstallScript: 
+mkdir -p %i/share
+mv %I/share/locale-dselect %i/share/locale
+  
   DocFiles: AUTHORS THANKS doc/README.feature-removal-schedule
   Description: Debian package management front-end
   DescDetail: 


--
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis  visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web apache2.info,1.10,1.11

2013-04-07 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13386

Modified Files:
apache2.info 
Log Message:
Fix so that apache2.2-common can be removed by moving the daemonic disable call 
to pre remove script while the daemonic xml file still exists, thanks akh

Index: apache2.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/apache2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- apache2.info11 Mar 2013 15:59:40 -  1.10
+++ apache2.info7 Apr 2013 14:55:33 -   1.11
@@ -1,6 +1,6 @@
 Package: apache2
 Version: 2.2.22
-Revision: 13.1
+Revision: 13.2
 ###
 Provides: httpd
 BuildDepends: fink (= 0.32), libaprutil.0-dev, libapr.0-dev, libpcap1, 
libpcre1, pkgconfig, openssl, openssl100-dev, openldap24-dev
@@ -671,6 +671,9 @@
 chown -R _www:_www %p/var/run/apache2
 chown -R _www:_www %p/var/www
   
+  PreRmScript: 
+daemonic disable apache2
+  
   PostRmScript: 
 # Allow apache 2.4 to override what we do.
 if [ -x %p/etc/apache2/upgrade-to-2.4-in-progress ] ; then
@@ -749,8 +752,6 @@
;;
esac
 fi
-
-daemonic disable apache2
   
   Description: Apache HTTP Server common files
   DescDetail: 


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.37,1.38

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8291

Modified Files:
dpkg.info 
Log Message:
okay can not comment out within a heredoc


Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- dpkg.info   5 Apr 2013 15:04:46 -   1.37
+++ dpkg.info   5 Apr 2013 15:12:23 -   1.38
@@ -84,8 +84,8 @@
 SetLDFLAGS: -framework CoreFoundation
 
 ### Uncomment --disable-dselect for bootstrap version, don't make dselect
-ConfigureParams: 
 #  --disable-dselect \
+ConfigureParams: 
   --disable-start-stop-daemon \
   --with-admindir=%p/var/lib/dpkg \
   --mandir=%p/share/man \


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/base expat1.info,1.3,1.4

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13937/10.4/stable/main/finkinfo/base

Modified Files:
expat1.info 
Log Message:
- Remove redundant CompileScript, it was just the default script anyhow
- Fix indenting on Splitoff


Index: expat1.info
===
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/expat1.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expat1.info 9 Aug 2008 18:43:31 -   1.3
+++ expat1.info 5 Apr 2013 17:03:48 -   1.4
@@ -13,10 +13,6 @@
 
 SetCFLAGS: -g -O2 -fshort-wchar
 ConfigureParams: --mandir=%p/share/man 
-CompileScript:
- ./configure %c
- make all
-
 InfoTest: TestScript: make check || exit 2
 InstallScript: make install DESTDIR=%d
 DocFiles: 
@@ -28,8 +24,8 @@
  Files: lib/libexpat.*.dylib
  Shlibs: 
   %p/lib/libexpat.1.dylib 7.0.0 %n (= 2.0.0-1)
-  
-  DocFiles: COPYING MANIFEST README
+ 
+ DocFiles: COPYING MANIFEST README
 
 
 Description: C library for parsing XML


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/base expat1.info,1.1,1.2

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/base
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13937/10.7/stable/main/finkinfo/base

Modified Files:
expat1.info 
Log Message:
- Remove redundant CompileScript, it was just the default script anyhow
- Fix indenting on Splitoff


Index: expat1.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/base/expat1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat1.info 21 Jul 2011 00:32:53 -  1.1
+++ expat1.info 5 Apr 2013 17:03:48 -   1.2
@@ -13,10 +13,6 @@
 
 SetCFLAGS: -g -O2 -fshort-wchar
 ConfigureParams: --mandir=%p/share/man 
-CompileScript:
- ./configure %c
- make all
-
 InfoTest: TestScript: make check || exit 2
 InstallScript: make install DESTDIR=%d
 DocFiles: 
@@ -28,8 +24,8 @@
  Files: lib/libexpat.*.dylib
  Shlibs: 
   %p/lib/libexpat.1.dylib 7.0.0 %n (= 2.0.0-1)
-  
-  DocFiles: COPYING MANIFEST README
+ 
+ DocFiles: COPYING MANIFEST README
 
 
 Description: C library for parsing XML


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.38,1.39

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14909

Modified Files:
dpkg.info 
Log Message:
Add gcc conflicts for ppc

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dpkg.info   5 Apr 2013 15:12:23 -   1.38
+++ dpkg.info   5 Apr 2013 17:22:08 -   1.39
@@ -12,6 +12,12 @@
   libncursesw5,
   bzip2-dev
 
+BuildConflicts: 
+  ( %m = powerpc ) gcc45, 
+  ( %m = powerpc ) gcc46, 
+  ( %m = powerpc ) gcc47,
+  ( %m = powerpc ) gcc48
+
 Depends: 
   bzip2-shlibs,
   libgettext8-shlibs,


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo ucf.info,1.8,1.9

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22108

Modified Files:
ucf.info 
Log Message:
Change to heredoc depends, remove comment of /sw from PatchScript for validator

Index: ucf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/ucf.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ucf.info10 Nov 2012 03:40:49 -  1.8
+++ ucf.info5 Apr 2013 18:58:12 -   1.9
@@ -2,9 +2,16 @@
 Version: 3.0025+nmu3
 Revision: 1
 ###
-BuildDepends: fink (= 0.34.99.git), dpkg (= 1.15), po-debconf
+BuildDepends: 
+  fink (= 0.34.99.git),
+  dpkg (= 1.15),
+  po-debconf
+
 Depends: debconf
-RuntimeDepends: getoptbin, coreutils
+RuntimeDepends: 
+  getoptbin,
+  coreutils
+
 ###
 Source: mirror:debian:pool/main/u/%n/%n_%v.tar.gz
 Source-MD5: a3f802fff918438dc9a05a5e29e2dc86
@@ -15,7 +22,7 @@
 perl -pi -e 's,/usr,%p,g' examples/postinst examples/postrm lcf lcf.1 ucf 
ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1
 # except perl, keep that one using /usr
 perl -pi -e 's,%p/bin/perl,/usr/bin/perl,g' examples/postinst examples/postrm 
lcf lcf.1 ucf ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1
-# fix /sw/bin/seq calls need to be /usr/bin/seq
+# fix %p/bin/seq calls need to be /usr/bin/seq
 perl -pi -e 's,%p/bin/seq,/usr/bin/seq,g' examples/postinst examples/postrm 
lcf lcf.1 ucf ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1 
 perl -pi -e 's,/etc,%p/etc,g' examples/postinst examples/postrm lcf lcf.1 ucf 
ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1
 perl -pi -e 's,/var,%p/var,g' examples/postinst examples/postrm lcf lcf.1 ucf 
ucf.1 ucf.conf ucf.conf.5 ucfq ucfq.1 ucfr ucfr.1


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo ucf.info,1.9,1.10

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22710

Modified Files:
ucf.info 
Log Message:
Add tests

Index: ucf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/ucf.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ucf.info5 Apr 2013 18:58:12 -   1.9
+++ ucf.info5 Apr 2013 19:05:16 -   1.10
@@ -31,6 +31,12 @@
 perl -pi -e s,stat -c '%%s',/usr/bin/stat -f '%%z',g ucf
 
 CompileScript: echo
+###
+InfoTest: 
+  #TestDepends: test-unit-pm
+  TestScript: make check || exit 2
+
+###
 InstallScript: 
 #!/bin/sh -ev
 


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg.info,1.39,1.40

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22737

Modified Files:
dpkg.info 
Log Message:
Remove full path to make

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- dpkg.info   5 Apr 2013 17:22:08 -   1.39
+++ dpkg.info   5 Apr 2013 19:05:44 -   1.40
@@ -110,13 +110,13 @@
 InfoTest: 
   TestConfigureParams: --disable-silent-rules
   TestDepends: io-string-pm, time-date-pm
-  TestScript: /usr/bin/make check || exit 2
+  TestScript: make check || exit 2
 
 
 InstallScript: 
   install -d -m 0755 %i/share/doc/dpkg
 
-  /usr/bin/make install DESTDIR=%d
+  make install DESTDIR=%d
 
   install -d -m 0755 %i/etc/dpkg/origins
   install -c -p -m 644 fink/origins %i/etc/dpkg/origins/fink


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debconf.info, 1.8, 1.9 debsums.info, 1.5, 1.6

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24627

Modified Files:
debconf.info debsums.info 
Log Message:
add heredoc depends and make 10.8 only since perl variants suck

Index: debsums.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debsums.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debsums.info3 Aug 2012 04:19:03 -   1.5
+++ debsums.info5 Apr 2013 19:34:13 -   1.6
@@ -1,19 +1,22 @@
-Info2: 
 Package: debsums
 Version: 2.0.52
 Revision: 1
 ###
-## Remove po4a
-BuildDepends: po-debconf
-Depends: dpkg (= 1.16.3), debconf, file-fnmatch-pm%type_pkg[perl], 
libdpkg-pm, ucf, cron-service
-###
-Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4, 
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] = 
5100) 10.5, (%type_pkg[perl] = 5100) 10.6, (%type_pkg[perl] = 5123) 10.7, 
(%type_pkg[perl] = 588) 10.4, (%type_pkg[perl] = 588) 10.5, (%type_pkg[perl] = 
588) 10.6, (%type_pkg[perl] = 5124) 10.8
-Type: perl (5.8.1 5.8.4 5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
-###
 Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
 Source-MD5: 30bdd32f923f15c839b30397683ce46c
 SourceDirectory: %n-%v
 ###
+## Remove po4a
+BuildDepends: po-debconf
+Depends: 
+  dpkg (= 1.16.3),
+  debconf,
+  file-fnmatch-pm5124,
+  libdpkg-pm,
+  ucf,
+  cron-service
+
+###
 PatchScript: 
 perl -pi -e 's,/usr,%p,g' debian/cron.* debsums rdebsums debsums_init 
man/debsums.1 man/po/*
 perl -pi -e 's,/etc,%p/etc,g' debian/cron.* debsums rdebsums debsums_init 
man/debsums.1 man/po/*
@@ -139,7 +142,10 @@
 exit 1
 esac
 
-ConfFiles: %p/etc/%n-ignore %p/etc/default/%n
+ConfFiles: 
+  %p/etc/%n-ignore
+  %p/etc/default/%n
+
 DocFiles: README debian/changelog debian/copyright
 Description: Tool for verification of deb files
 DescDetail: 
@@ -149,4 +155,3 @@
 License: GPL
 Maintainer: Justin F. Halett the...@lists.sourceforge.net
 Homepage: http://packages.debian.org/unstable/debsums
-

Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debconf.info24 Aug 2012 16:37:35 -  1.8
+++ debconf.info5 Apr 2013 19:34:13 -   1.9
@@ -3,13 +3,38 @@
 Revision: 1
 Type: perl
 ###
+Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4, 
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] = 
5100) 10.5, (%type_pkg[perl] = 5100) 10.6, (%type_pkg[perl] = 5123) 10.7, 
(%type_pkg[perl] = 588) 10.4, (%type_pkg[perl] = 588) 10.5, (%type_pkg[perl] = 
588) 10.6, (%type_pkg[perl] = 5124) 10.8
+Type: perl (5.8.1 5.8.4 5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
 ## po4a, python27, python3
-BuildDepends: fink (= 0.34.99.git), dpkg (= 1.15), gettext-tools, 
po-debconf, gawk
-Depends: dpkg ( 1.15), dialog, gettext-tools
-Conflicts: cdebconf ( 0.96), debconf-tiny, apt ( 0.3.12.1), menu (= 
2.1.3-1), dialog ( 0.9b-20020814-1), whiptail ( 0.51.4-11), whiptail-utf8 
(= 0.50.17-13), debconf-utils ( 1.3.22)
+BuildDepends: 
+  fink (= 0.34.99.git),
+  dpkg (= 1.15),
+  gettext-tools,
+  po-debconf,
+  gawk
+
+Depends: 
+  dpkg ( 1.15),
+  dialog,
+  gettext-tools
+
+Conflicts: 
+  cdebconf ( 0.96),
+  debconf-tiny,
+  apt ( 0.3.12.1),
+  menu (= 2.1.3-1),
+  dialog ( 0.9b-20020814-1),
+  whiptail ( 0.51.4-11),
+  whiptail-utf8 (= 0.50.17-13),
+  debconf-utils ( 1.3.22)
+
 Provides: debconf-2.0
 Replaces: debconf-tiny
-Suggests: bash-completion, net-ldap-pm5123, term-readline-gnu-pm5123
+Suggests: 
+  bash-completion,
+  net-ldap-pm%type_pkg[perl],
+  term-readline-gnu-pm%type_pkg[perl]
+
 ###
 Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.gz
 Source-MD5: 6978cc5f49a3fce6de8e53fc46a6a243
@@ -54,11 +79,10 @@
 make
 
 ###
-## Dep missing from fink
-#InfoTest: 
-#  TestDepends: test-unit-pmXXX
-#  TestScript: perl test_debconf.pl --all || exit 2
-#
+InfoTest: 
+  TestDepends: test-unit-pm
+  TestScript: perl test_debconf.pl --all || exit 2
+
 ###
 InstallScript: 
 #!/bin/sh -ev


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debconf.info, 1.9, 1.10 debconf.patch, 1.2, 1.3

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25459

Modified Files:
debconf.info debconf.patch 
Log Message:
New upstream relase of debconf, change to heredoc depends, add tests but 
disable for now since it's broken

Index: debconf.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debconf.patch   29 Jun 2012 15:08:22 -  1.2
+++ debconf.patch   5 Apr 2013 19:52:23 -   1.3
@@ -58,7 +58,7 @@
 diff -ruN debconf-1.5.43.orig/Debconf/FrontEnd/Gnome.pm 
debconf-1.5.43/Debconf/FrontEnd/Gnome.pm
 --- debconf-1.5.43.orig/Debconf/FrontEnd/Gnome.pm  2011-06-22 
15:48:56.0 -0600
 +++ debconf-1.5.43/Debconf/FrontEnd/Gnome.pm   2012-06-29 08:58:24.0 
-0600
-@@ -148,11 +148,11 @@
+@@ -165,11 +165,11 @@
if (system('type lsb_release /dev/null 21') == 0) {
$distribution=lc(`lsb_release -is`);
chomp $distribution;
@@ -1157,7 +1157,7 @@
  }
  
  use strict;
-@@ -290,7 +290,7 @@
+@@ -275,7 +275,7 @@
my @ret;
local $/=\n\n;

@@ -1183,9 +1183,9 @@
 diff -ruN debconf-1.5.43.orig/frontend debconf-1.5.43/frontend
 --- debconf-1.5.43.orig/frontend   2011-02-01 17:08:31.0 -0700
 +++ debconf-1.5.43/frontend2012-06-29 08:58:24.0 -0600
-@@ -40,10 +40,10 @@
- elsif ($ARGV[0]=~m!^.*/(.*?)\.(?:postinst|postrm|prerm)$!) {
-   $package=$1;
+@@ -44,10 +44,10 @@
+   # Avoid spurious title updates with triggered actions:
+   $no_title=1 if $action eq 'triggered';
  }
 -elsif (-e /var/lib/dpkg/tmp.ci/control) {
 +elsif (-e @FINKPREFIX@/var/lib/dpkg/tmp.ci/control) {
@@ -1196,7 +1196,7 @@
|| die Debconf: unable to open control file: $!;
while (CONTROL) {
if (/^Package: (.*)/) {
-@@ -82,7 +82,7 @@
+@@ -86,7 +86,7 @@
unless ($ARGV[0]=~m/(.*)config$/  
trytemplate(${1}templates)) {
# Finally, look in debconf lib directory for the base
# filename with .templates appended.
@@ -1205,7 +1205,7 @@
debug developer = Couldn't find a templates 
file.
}
}
-@@ -98,7 +98,7 @@
+@@ -102,7 +102,7 @@
  # lets you dpkg -i somepackage.deb and have its config script be run first.
  #
  # If it is the preinst, everything is in this weird directory deep in

Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- debconf.info5 Apr 2013 19:34:13 -   1.9
+++ debconf.info5 Apr 2013 19:52:23 -   1.10
@@ -1,10 +1,8 @@
 Package: debconf
-Version: 1.5.46
+Version: 1.5.49
 Revision: 1
 Type: perl
 ###
-Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4, 
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] = 
5100) 10.5, (%type_pkg[perl] = 5100) 10.6, (%type_pkg[perl] = 5123) 10.7, 
(%type_pkg[perl] = 588) 10.4, (%type_pkg[perl] = 588) 10.5, (%type_pkg[perl] = 
588) 10.6, (%type_pkg[perl] = 5124) 10.8
-Type: perl (5.8.1 5.8.4 5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
 ## po4a, python27, python3
 BuildDepends: 
   fink (= 0.34.99.git),
@@ -32,17 +30,17 @@
 Replaces: debconf-tiny
 Suggests: 
   bash-completion,
-  net-ldap-pm%type_pkg[perl],
-  term-readline-gnu-pm%type_pkg[perl]
+  net-ldap-pm5123,
+  term-readline-gnu-pm5123
 
 ###
 Source: mirror:debian:/pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 6978cc5f49a3fce6de8e53fc46a6a243
+Source-MD5: cf2b9600849f2be083760e1eb33ba05c
 SourceDirectory: %n-%v
-TarFilesRename: debconf-1.5.46/debconf$:debconf-1.5.46/debconf.tmp
+TarFilesRename: debconf-1.5.49/debconf$:debconf-1.5.49/debconf.tmp
 ###
 PatchFile: %n.patch
-PatchFile-MD5: 014d385f326ace11c562c43b82dbc7bb
+PatchFile-MD5: 5d8fc8aff92b821c0950313e009e1401
 PatchScript: 
 sed 's|@FINKPREFIX@|%p|g'  %{PatchFile} | patch -p1
 
@@ -79,10 +77,11 @@
 make
 
 ###
-InfoTest: 
-  TestDepends: test-unit-pm
-  TestScript: perl test_debconf.pl --all || exit 2
-
+# Know issue upstream call to abstract method CopyDBTestSetup::name
+#InfoTest: 
+#  TestDepends: test-unit-pm
+#  TestScript: perl test_debconf.pl --all || exit 2
+#
 ###
 InstallScript: 
 #!/bin/sh -ev


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list

[cvs] experimental/thesin/finkinfo dpkg_1.16.10.tar.gz,1.1,NONE

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26899

Removed Files:
dpkg_1.16.10.tar.gz 
Log Message:
Moved the tar ball to my personal webserver for now, webcvs was changing it 
some how

--- dpkg_1.16.10.tar.gz DELETED ---


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debconf.info,1.10,1.11

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29548

Modified Files:
debconf.info 
Log Message:
coreutils-defaults kills the build, thanks cirdan

Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- debconf.info5 Apr 2013 19:52:23 -   1.10
+++ debconf.info5 Apr 2013 21:09:25 -   1.11
@@ -16,6 +16,9 @@
   dialog,
   gettext-tools
 
+BuildConflicts: 
+  coreutils-default
+
 Conflicts: 
   cdebconf ( 0.96),
   debconf-tiny,


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo debconf.info,1.11,1.12

2013-04-05 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30797

Modified Files:
debconf.info 
Log Message:
Remove buildconflicts which was a temp fix, force usage or 
/usr/bin/xargs,awk,basename

Index: debconf.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/debconf.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- debconf.info5 Apr 2013 21:09:25 -   1.11
+++ debconf.info5 Apr 2013 21:32:53 -   1.12
@@ -16,9 +16,6 @@
   dialog,
   gettext-tools
 
-BuildConflicts: 
-  coreutils-default
-
 Conflicts: 
   cdebconf ( 0.96),
   debconf-tiny,
@@ -47,12 +44,16 @@
 PatchScript: 
 sed 's|@FINKPREFIX@|%p|g'  %{PatchFile} | patch -p1
 
+# set basename/xargs to /usr/bin
+perl -pi -e 's,basename,/usr/bin/basename,g' Makefile doc/Makefile po/Makefile
+perl -pi -e 's,xargs,/usr/bin/xargs,g' Makefile doc/Makefile po/Makefile
+
 # BSD xargs doesn't know -i
-perl -pi -e 's,xargs -i,/usr/bin/xargs -I {},g' Makefile doc/Makefile 
po/Makefile
+perl -pi -e 's,xargs -i,xargs -I {},g' Makefile doc/Makefile po/Makefile
 
 # BSD find doesn't know -printf
 perl -pi -e s,-printf '(.+)' \|,-print0 \|,g doc/Makefile
-perl -pi -e 's,xargs -I,xargs -0 basename | /usr/bin/xargs -I,g' doc/Makefile
+perl -pi -e 's,xargs -I,xargs -0 /usr/bin/basename | /usr/bin/xargs -I,g' 
doc/Makefile
 
 # perl is in lib not share
 perl -pi -e 's,share/perl5,lib/perl5,g' Makefile
@@ -310,8 +311,8 @@
 PreRmScript: 
 # copied from %p/share/debhelper/autoscripts/prerm-python for now
 dpkg -L %n |
-   awk '$0~/\.py$/ {print $0c\n $0o}' |
-   xargs rm -f 2
+   /usr/bin/awk '$0~/\.py$/ {print $0c\n $0o}' |
+   /usr/bin/xargs rm -f 2
 
 Description: Package configuration management system
 DescDetail: 


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo dpkg_1.16.10.tar.gz, NONE, 1.1 dpkg.info, 1.35, 1.36

2013-04-04 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20393

Modified Files:
dpkg.info 
Added Files:
dpkg_1.16.10.tar.gz 
Log Message:
dpkg repackage tarball required for my bootstrap

--- NEW FILE: dpkg_1.16.10.tar.gz ---
(This appears to be a binary file; contents omitted.)

Index: dpkg.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- dpkg.info   31 Oct 2012 15:32:39 -  1.35
+++ dpkg.info   5 Apr 2013 00:49:37 -   1.36
@@ -677,7 +677,7 @@
 bin/dpkg-source
 bin/dpkg-vendor
 share/dpkg/*.mk
-share/locale/ca/LC_MESSAGES/dpkg-dev.mo
+share/locale/*/LC_MESSAGES/dpkg-dev.mo
 share/locale/de/LC_MESSAGES/dpkg-dev.mo
 share/locale/es/LC_MESSAGES/dpkg-dev.mo
 share/locale/fr/LC_MESSAGES/dpkg-dev.mo
@@ -700,19 +700,7 @@
 share/man/man1/dpkg-shlibdeps.1
 share/man/man1/dpkg-source.1
 share/man/man1/dpkg-vendor.1
-share/man/man5/deb-control.5
-share/man/man5/deb-extra-override.5
-share/man/man5/deb-old.5
-share/man/man5/deb-origin.5
-share/man/man5/deb-override.5
-share/man/man5/deb-shlibs.5
-share/man/man5/deb-split.5
-share/man/man5/deb-src-control.5
-share/man/man5/deb-substvars.5
-share/man/man5/deb-symbols.5
-share/man/man5/deb-triggers.5
-share/man/man5/deb-version.5
-share/man/man5/deb.5
+share/man/man5/deb*
   
   DocFiles: AUTHORS THANKS doc/README.api doc/README.feature-removal-schedule 
doc/triggers.txt
   Description: Debian package development tools
@@ -779,7 +767,7 @@
 bin/dselect
 lib
 share/locale/bs/LC_MESSAGES/dselect.mo
-share/locale/ca/LC_MESSAGES/dselect.mo
+share/locale/*/LC_MESSAGES/dselect.mo
 share/locale/cs/LC_MESSAGES/dselect.mo
 share/locale/da/LC_MESSAGES/dselect.mo
 share/locale/de/LC_MESSAGES/dselect.mo


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/thesin/finkinfo texinfo.info, 1.9, 1.10 texinfo.patch, 1.2, 1.3

2013-04-02 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4142

Modified Files:
texinfo.info texinfo.patch 
Log Message:
 - Update to current fink 5.1
 - Still need to test bootstrapping with it.


Index: texinfo.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- texinfo.info3 Aug 2012 02:46:22 -   1.9
+++ texinfo.info2 Apr 2013 20:40:06 -   1.10
@@ -1,76 +1,72 @@
 Package: texinfo
-Version: 4.13
-Revision: 1002
+Version: 5.1
+Revision: 1.1
 Source: gnu
-Source-MD5: 71ba711519209b5fb583fed2b3d86fcb
+Source-MD5: 54e250014fe698fb4832016158747c03
 SourceDirectory: %n-%v
 BuildDepends: fink (= 0.34.99.git), libiconv-dev, libncurses5 (= 
5.4-20041023-1006), libgettext8-dev, gettext-tools
 Depends: ncurses (= 5.4-20041023-1006), libncurses5-shlibs (= 
5.4-20041023-1006), libgettext8-shlibs, libiconv
 Replaces: tetex-base ( 3.0-1)
 PatchFile: %n.patch
-PatchFile-MD5: 27c113940707c9d4f99d7c6ceb67
+PatchFile-MD5: 547bfe54593879cd6a62f9a07a2b84ee
 PatchScript: 
 chmod a+x build-aux/install-sh
 
 sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
+patch -p1  fink/patches/fix-broken-po-files
 patch -p1  fink/patches/warn_missing_tex
-patch -p1  fink/patches/replace_egrep_fgrep_sigs
-# UTF-8 issues in patch
-#patch -p1  fink/patches/info_universal_argument
+patch -p1  fink/patches/numerical-signal-names
+patch -p1  fink/patches/info_universal_argument
 patch -p1  fink/patches/dont_build_info
-patch -p1  fink/patches/texi-allow-tilde
-patch -p1  fink/patches/check-nodes-boundaries
-patch -p1  fink/patches/info_core_dump_small_window
-patch -p1  fink/patches/minor-buffer-size-fix
-patch -p1  fink/patches/texi2dvi-local-fallback-syntax.diff
-patch -p1  fink/patches/texi2dvi_non-C_locale
-patch -p1  fink/patches/texi-allow-shell-escape.diff
 
 # help2man isn't present in bootstrap so patch it out
 perl -pi -e 's,help2man,true,g' configure
 
-ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
+ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info 
--with-external-Text-Unidecode=yes --with-external-libintl-perl=yes
 CompileScript: 
  ./configure %c
  echo '#define DEFAULT_INFOPATH 
%p/share/info:%p/info:/usr/local/share/info:/usr/local/lib/info:/usr/local/info:/usr/share/info:.'
 config.h
  make
 
+InfoTest: 
+  TestScript: /usr/bin/make check ALL_TESTS=yes || exit 2
+
 InstallScript: 
-make install prefix=%i mandir=%i/share/man infodir=%i/share/info
-TEXMF=%i/share/texmf make install-tex prefix=%i mandir=%i/share/man 
infodir=%i/share/info
-find %i -type f -name dir | xargs rm -f
-# pdfcolor and epsf.tex are in tetex and texlive
-rm -rf %i/share/texmf/tex/plain
-rm -rf %i/share/texmf/tex/generic
-rm -rf %i/share/texmf/pdftex/plain/misc/pdfcolor.tex
+  make install prefix=%i mandir=%i/share/man infodir=%i/share/info
+  TEXMF=%i/share/texmf make install-tex prefix=%i mandir=%i/share/man 
infodir=%i/share/info
+  find %i -type f -name dir | xargs rm -f
 
-# charset.alias supplied from gettext
-rm -rf %i/lib
+  # epsf.tex is in texlive
+  rm -rf %i/share/texmf/tex/generic
 
-install -d -m 0755 %i/share/man/man1
-install -m 0644 fink/texi2pdf.man %i/share/man/man1/texi2pdf.1
-mv %i/bin/install-info %i/bin/ginstall-info
-sed -e s/install-info/g/g \
-%i/share/man/man1/install-info.1 \
-%i/share/man/man1/ginstall-info.1
-rm -f %i/share/man/man1/install-info.1
+  # install additional files that are not installed by default
+  install -m 0755 util/txixml2texi %i/bin/txixml2texi
 
-install -m 0755 fink/install-info.sh %i/bin/install-info
-install -m 0644 fink/install-info.1 %i/share/man/man1/install-info.1
-install -d -m 0755 %i/sbin
-install -m 0755 fink/update-info-dir %i/sbin/update-info-dir
-install -d -m 0755 %i/share/man/man8
-install -m 0644 fink/update-info-dir.8 %i/share/man/man8/update-info-dir.8
-install -d -m 0755 %i/share/menu
-install -m 0644 fink/info.menu %i/share/menu/info
+  # work on fink install-info
+  mv %i/bin/install-info %i/bin/ginstall-info
+  sed -e s/install-info/g/g \
+  %i/share/man/man1/install-info.1 \
+  %i/share/man/man1/ginstall-info.1
+  rm -f %i/share/man/man1/install-info.1
+  install -m 0755 fink/install-info.sh %i/bin/install-info
+  install -m 0644 fink/install-info.1 %i/share/man/man1/install-info.1
+  install -d -m 0755 %i/sbin
+  install -m 0755 fink/update-info-dir %i/sbin/update-info-dir
+  install -d -m 0755 %i/share/man/man8
+  install -m 0644 fink/update-info-dir.8 %i/share/man/man8/update-info-dir.8
+  install -d -m 0755 %i/etc/texmf/fmt.d
+  install -m 0644 fink/conf/50cyrtexinfo.cnf %i/etc/texmf/fmt.d
+  install -d -m 0755 %i/var/lib/tex-common/fmtutil-cnf
+  echo 50cyrtexinfo  %i/var/lib/tex-common/fmtutil-cnf/texinfo.list
 
-install -d -m 0755 %i/etc/texmf/fmt.d

[cvs] experimental/thesin/finkinfo texinfo.info,1.10,1.11

2013-04-02 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5239

Modified Files:
texinfo.info 
Log Message:
Update to use wildcards for installs, makes things a little neater

Index: texinfo.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- texinfo.info2 Apr 2013 20:40:06 -   1.10
+++ texinfo.info2 Apr 2013 21:04:49 -   1.11
@@ -242,12 +242,9 @@
   Provides: info-browser
   Replaces: texinfo ( 4.13-1002), dpkg ( 1.15)
   Files: 
-bin/info
-bin/infokey
-share/man/man1/info.1
-share/man/man1/infokey.1
-share/man/man5/info.5
-share/menu/info
+bin/info*
+share/man/man1/info*
+share/menu
   
   DocFiles: README COPYING AUTHORS NEWS TODO doc/*.texi 
fink/transition-plan.txt
   Description: Standalone GNU Info documentation browser
@@ -285,7 +282,7 @@
 sbin
 share/man/man1/ginstall-info.1
 share/man/man1/install-info.1
-share/man/man8/update-info-dir.8
+share/man/man8
   
   DocFiles: README COPYING AUTHORS NEWS TODO doc/*.texi 
fink/transition-plan.txt
   InterestTriggers: 


--
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.7/stable/main/finkinfo/web apache2.info, 1.9, 1.10 apache2.patch, 1.8, 1.9

2013-03-11 Thread Justin F. Hallett
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18875

Modified Files:
apache2.info apache2.patch 
Log Message:
  * Urgency medium for security fixes.
  * CVE-2013-1048: Fix symlink vulnerability when creating %p/var/lock/apache2
  * CVE-2012-3499, CVE-2012-4558: Fix XSS flaws in various modules.
  * mod_log_forensic: Fix spurious '-' characters being logged, causing
false positives. Closes: #693292
  * Document APACHE_ARGUMENTS in envvars (Closes: #693299)
  * Change user/group from www to _www for comparison reasons
  * Update owner on %p/var/lock/apache2 and %p/var/run/apache2 to _www


Index: apache2.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/apache2.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- apache2.info13 Nov 2012 21:51:36 -  1.9
+++ apache2.info11 Mar 2013 15:59:40 -  1.10
@@ -1,6 +1,6 @@
 Package: apache2
 Version: 2.2.22
-Revision: 12.1
+Revision: 13.1
 ###
 Provides: httpd
 BuildDepends: fink (= 0.32), libaprutil.0-dev, libapr.0-dev, libpcap1, 
libpcre1, pkgconfig, openssl, openssl100-dev, openldap24-dev
@@ -10,7 +10,7 @@
 Source-MD5: d77fa5af23df96a8af68ea8114fa6ce1
 ###
 PatchFile: %n.patch
-PatchFile-MD5: 972bcfcf8921e2189e381ff542986004
+PatchFile-MD5: 4c0371e7f703d7b8f635e7b6f4cb0d79
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -44,6 +44,8 @@
   patch -p1  fink/patches/dbmmanage-perl-510.patch
   patch -p1  fink/patches/SSLProtocol-tls11-12.2.patch
   patch -p1  fink/patches/disable-ssl-compression.patch
+  patch -p1  fink/patches/CVE-2012-3499_CVE-2012-4558_XSS.patch
+  patch -p1  fink/patches/mod_log_forensic_693292.patch
 
   ## decode new icons
   for i in %b/fink/icons/*.txt; do cd %b/fink/icons; uudecode  $i; done
@@ -112,7 +114,7 @@
--with-program-name=apache2 \
--with-ldap=yes --with-ldap-include=%p/include\
--with-ldap-lib=%p/lib \
-   --with-suexec-caller=www \
+   --with-suexec-caller=_www \
--with-suexec-bin=%p/lib/apache2/suexec \
--with-suexec-docroot=%p/var/www \
--with-suexec-userdir=Sites \
@@ -291,7 +293,7 @@
   
   DocFiles: LICENSE
   PostInstScript: 
-chown root:www %p/lib/apache2/suexec
+chown root:_www %p/lib/apache2/suexec
   
 
 SplitOff3: 
@@ -651,7 +653,7 @@
chown root:admin %p/var/cache/apache2/
fi
rm -rf %p/var/cache/apache2/mod_disk_cache
-   install -o www -g www -d %p/var/cache/apache2/mod_disk_cache/
+   install -o _www -g _www -d %p/var/cache/apache2/mod_disk_cache/
fi
 fi
 
@@ -661,13 +663,13 @@
 
 daemonic enable apache2
 
-chown -R root:www %p/var/lock/apache2
-chown -R www:www %p/var/log/apache2
-chown -R www:www %p/var/cache/apache2/mod_disk_cache
+chown -R _www:_www %p/var/lock/apache2
+chown -R _www:_www %p/var/log/apache2
+chown -R _www:_www %p/var/cache/apache2/mod_disk_cache
 chmod 755 %p/var/log/apache2
 chmod 644 %p/var/log/apache2/*.log
-chown -R root:www %p/var/run/apache2
-chown -R www:www %p/var/www
+chown -R _www:_www %p/var/run/apache2
+chown -R _www:_www %p/var/www
   
   PostRmScript: 
 # Allow apache 2.4 to override what we do.

Index: apache2.patch
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/apache2.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- apache2.patch   13 Nov 2012 21:51:37 -  1.8
+++ apache2.patch   11 Mar 2013 15:59:40 -  1.9
@@ -1928,8 +1928,8 @@
 +Include @FINKPREFIX@/etc/apache2/sites-enabled/[^.#]*
 diff -ruN httpd-2.2.22.orig/fink/apache2ctl httpd-2.2.22/fink/apache2ctl
 --- httpd-2.2.22.orig/fink/apache2ctl  1969-12-31 17:00:00.0 -0700
-+++ httpd-2.2.22/fink/apache2ctl   2012-06-12 08:46:21.0 -0600
-@@ -0,0 +1,154 @@
 httpd-2.2.22/fink/apache2ctl   2013-03-11 09:46:01.0 -0600
+@@ -0,0 +1,179 @@
 +#!/bin/sh
 +#
 +# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -2036,10 +2036,35 @@
 +fi
 +}
 +
++mkdir_chown () {
++local OWNER=$1
++local DIR=$2
++local STAT=$(LC_ALL=C stat -c %F:%U $DIR 2 /dev/null || true)
++if [ $STAT =  ] ; then
++local TMPNAME=$(mktemp -d $DIR.XX) || exit 1
++chmod 755 $TMPNAME || exit 1
++chown $OWNER $TMPNAME || exit 1
++if ! mv -T $TMPNAME $DIR 2 /dev/null; then
++rmdir $TMPNAME
++# check for race with other apachectl
++if [ $(LC_ALL=C stat -f %HT: $DIR 2/dev/null)$(LC_ALL=C stat -f 
%u $DIR 2/dev/null | /usr/bin/xargs /usr/bin/id -n -u 2/dev/null) != 
Directory:$OWNER ]
++then
++echo Cannot create $DIR with owner $OWNER.
++echo Please fix 

[cvs] experimental/thesin/finkinfo php5.info, 1.10, 1.11 php5.patch, 1.7, 1.8

2013-03-07 Thread Justin F. Hallett
Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12457

Modified Files:
php5.info php5.patch 
Log Message:
  * [CVE-2013-1635] Fixed external entity loading
  * [CVE-2013-1643] Check if soap.wsdl_cache_dir confirms to open_basedir
(Closes: #702221)


Index: php5.info
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- php5.info   22 Feb 2013 20:59:38 -  1.10
+++ php5.info   7 Mar 2013 21:21:08 -   1.11
@@ -1,7 +1,7 @@
 Info2: 
 Package: php5
 Version: 5.4.4
-Revision: 13.1
+Revision: 14.1
 Type: sapiver (20100525)
 ###
 BuildDepends: fink (= 0.34.99.git), automake1.11, apache2-prefork-dev, 
aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, expat1, 
file-dev, freetds (= 1:0.91-1), freetds-dev, freetype219, gd2, glib2-dev, 
gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, libgcrypt, 
libicu36-dev, libjpeg8, libmcrypt, libmhash2, libonig2-dev, libodbc3-dev, 
libpcre1, libpng15, libtidy-0.99.0-dev, libtool2, libxml2, libxslt, 
mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, netcat, 
openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, recode-dev, 
sed, sqlite3-dev, wrap
@@ -69,7 +69,7 @@
 Source: mirror:custom:distributions/php-%v.tar.gz
 Source-MD5: 8366c3626f2275ab8c7ef5e2d6bc5bd7
 PatchFile: %n.patch
-PatchFile-MD5: e2191e4e5ebd6cbbb121fc446c23d647
+PatchFile-MD5: b9637a9aeabc3879242fe37df492c992
 PatchScript: 
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
 
@@ -138,6 +138,8 @@
   patch -p1  fink/patches/expose_all_built_and_installed_apis.patch
   patch -p1  
fink/patches/session.c_rfc1867_crashes_php_even_though_turned_off.patch
   patch -p1  
fink/patches/php-5.4.11-session-reset-global-var-in-shutdown.patch
+  patch -p1  fink/patches/CVE-2013-1635.patch
+  patch -p1  fink/patches/CVE-2013-1643.patch
 
   patch -p1  fink/patches/giconv_is_inferior.patch
   patch -p1  fink/patches/gd-libJPEG-Version.patch

Index: php5.patch
===
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- php5.patch  22 Feb 2013 20:59:38 -  1.7
+++ php5.patch  7 Mar 2013 21:21:09 -   1.8
@@ -215,6 +215,193 @@
 +  }
 +  php_stream_closedir(stream);
 + 
+diff -ruN php-5.4.4.orig/fink/patches/CVE-2013-1635.patch 
php-5.4.4/fink/patches/CVE-2013-1635.patch
+--- php-5.4.4.orig/fink/patches/CVE-2013-1635.patch1969-12-31 
17:00:00.0 -0700
 php-5.4.4/fink/patches/CVE-2013-1635.patch 2013-03-07 10:22:25.0 
-0700
+@@ -0,0 +1,44 @@
++--- a/ext/soap/soap.c
+ b/ext/soap/soap.c
++@@ -497,10 +497,40 @@ ZEND_INI_MH(OnUpdateCacheMode)
++  return SUCCESS;
++ }
++ 
+++static PHP_INI_MH(OnUpdateCacheDir)
+++{
+++ /* Only do the open_basedir check at runtime */
+++ if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) {
+++ char *p;
+++
+++ if (memchr(new_value, '\0', new_value_length) != NULL) {
+++ return FAILURE;
+++ }
+++
+++ /* we do not use zend_memrchr() since path can contain ; itself 
*/
+++ if ((p = strchr(new_value, ';'))) {
+++ char *p2;
+++ p++;
+++ if ((p2 = strchr(p, ';'))) {
+++ p = p2 + 1;
+++ }
+++ } else {
+++ p = new_value;
+++ }
+++
+++ if (PG(open_basedir)  *p  php_check_open_basedir(p 
TSRMLS_CC)) {
+++ return FAILURE;
+++ }
+++ }
+++
+++ OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, 
mh_arg3, stage TSRMLS_CC);
+++ return SUCCESS;
+++}
+++
++ PHP_INI_BEGIN()
++ STD_PHP_INI_ENTRY(soap.wsdl_cache_enabled, 1, PHP_INI_ALL, 
OnUpdateCacheEnabled,
++   cache_enabled, zend_soap_globals, soap_globals)
++-STD_PHP_INI_ENTRY(soap.wsdl_cache_dir, /tmp, PHP_INI_ALL, 
OnUpdateString,
+++STD_PHP_INI_ENTRY(soap.wsdl_cache_dir, /tmp, PHP_INI_ALL, 
OnUpdateCacheDir,
++   cache_dir, zend_soap_globals, soap_globals)
++ STD_PHP_INI_ENTRY(soap.wsdl_cache_ttl, 86400, PHP_INI_ALL, 
OnUpdateLong,
++   cache_ttl, zend_soap_globals, soap_globals)
+diff -ruN php-5.4.4.orig/fink/patches/CVE-2013-1643.patch 
php-5.4.4/fink/patches/CVE-2013-1643.patch
+--- php-5.4.4.orig/fink/patches/CVE-2013-1643.patch1969-12-31 
17:00:00.0 -0700
 php-5.4.4/fink/patches/CVE-2013-1643.patch 2013-03-07 10:22:52.0 
-0700
+@@ -0,0 +1,135 @@
++--- a/ext/libxml/libxml.c
+ b/ext/libxml/libxml.c
++@@ -270,6 +270,7 @@ static 

  1   2   3   4   5   6   7   8   9   10   >