[Pkg-php-commits] r899 - in pear: . php-net-pop3 php-net-pop3/trunk php-net-pop3/trunk/debian php-net-pop3/trunk/debian/patches

Mark Hershberger mah-guest at alioth.debian.org
Tue Sep 25 14:17:21 UTC 2007


tags 441651 pending
thanks

Author: mah-guest
Date: 2007-09-25 14:17:21 +0000 (Tue, 25 Sep 2007)
New Revision: 899

Added:
   pear/php-net-pop3/
   pear/php-net-pop3/branches/
   pear/php-net-pop3/tags/
   pear/php-net-pop3/trunk/
   pear/php-net-pop3/trunk/debian/
   pear/php-net-pop3/trunk/debian/changelog
   pear/php-net-pop3/trunk/debian/compat
   pear/php-net-pop3/trunk/debian/control
   pear/php-net-pop3/trunk/debian/copyright
   pear/php-net-pop3/trunk/debian/patches/
   pear/php-net-pop3/trunk/debian/patches/00list
   pear/php-net-pop3/trunk/debian/patches/pear-bug-11439-parsed-headers-eol.dpatch
   pear/php-net-pop3/trunk/debian/patches/pear-bug-4243-sasl-capabilities.dpatch
   pear/php-net-pop3/trunk/debian/rules
   pear/php-net-pop3/trunk/debian/svn-deblayout
   pear/php-net-pop3/trunk/debian/watch
Log:
initial commit


Property changes on: pear/php-net-pop3/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: pear/php-net-pop3/trunk/debian/changelog
===================================================================
--- pear/php-net-pop3/trunk/debian/changelog	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/changelog	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,15 @@
+php-net-pop3 (1.3.6-2) unstable; urgency=low
+
+  * Created patch to fix up Header parsing.  See upstream
+    <http://pear.php.net/bugs/11439>.
+  * Created patch to fix up Capability parsing.  See upstream 
+    <http://pear.php.net/bugs/4243>.
+
+ -- Mark A. Hershberger <mhershberger at intrahealth.org>  Tue, 25 Sep 2007 10:15:20 -0400
+
+php-net-pop3 (1.3.6-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #441651)
+
+ -- Mark A. Hershberger <mhershberger at intrahealth.org>  Sat, 22 Sep 2007 12:56:34 -0400
+

Added: pear/php-net-pop3/trunk/debian/compat
===================================================================
--- pear/php-net-pop3/trunk/debian/compat	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/compat	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1 @@
+5

Added: pear/php-net-pop3/trunk/debian/control
===================================================================
--- pear/php-net-pop3/trunk/debian/control	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/control	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,19 @@
+Source: php-net-pop3
+Section: web
+Priority: optional
+Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
+Uploaders: Mark A. Hershberger <mhershberger at intrahealth.org>
+Build-Depends: debhelper (>= 5), dpatch (>=2.0.25)
+Build-Depends-Indep: php-pear (>=5.2.0-8)
+XS-Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-net-pop3/trunk
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-net-pop3/trunk
+Homepage: http://pear.php.net/package/Net_POP3
+Standards-Version: 3.7.2
+
+Package: php-net-pop3
+Architecture: all
+Depends: php-pear (>=5.2.0-8), php-net-socket (>=1.0.6-2)
+Description: PHP PEAR module for the POP3 Protocol
+ Provides a POP3 class to access POP3 server. Support all POP3
+ commands including UIDL listings, APOP authentication, DIGEST-MD5 and
+ CRAM-MD5 using optional Auth_SASL package

Added: pear/php-net-pop3/trunk/debian/copyright
===================================================================
--- pear/php-net-pop3/trunk/debian/copyright	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/copyright	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,16 @@
+This package was debianized by Mark A. Hershberger
+<mhershberger at intrahealth.org> and is currently maintained by the
+Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
+
+It was downloaded from http://pear.php.net/package/Net_POP3
+
+Upstream Authors:
+    * Damian Alejandro Fernandez Sosa <damlists at cnba.uba.ar>
+    * George Schlossnagle <george at omniti.com>
+    * Richard Heyes <richard at phpguru.org>
+
+Copyright:
+
+BSD licenced. Copies can be found in /usr/share/common-licenses/BSD on
+Debian systems.
+

Added: pear/php-net-pop3/trunk/debian/patches/00list
===================================================================
--- pear/php-net-pop3/trunk/debian/patches/00list	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/patches/00list	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,2 @@
+pear-bug-4243-sasl-capabilities
+pear-bug-11439-parsed-headers-eol

Added: pear/php-net-pop3/trunk/debian/patches/pear-bug-11439-parsed-headers-eol.dpatch
===================================================================
--- pear/php-net-pop3/trunk/debian/patches/pear-bug-11439-parsed-headers-eol.dpatch	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/patches/pear-bug-11439-parsed-headers-eol.dpatch	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pear-bug-11439-parsed-headers-eol.dpatch by Mark A. Hershberger  <mhershberger at intrahealth.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up EOL parsing for some borken email
+
+ at DPATCH@
+
+diff -ub t/Net_POP3-1.3.6/POP3.php\~ t/Net_POP3-1.3.6/POP3.php
+--- t/Net_POP3-1.3.6/POP3.php~	2005-04-04 22:17:41.000000000 -0400
++++ t/Net_POP3-1.3.6/POP3.php	2007-09-22 17:13:30.000000000 -0400
+@@ -715,8 +715,8 @@
+ 
+             $raw_headers = rtrim($this->getRawHeaders($msg_id));
+ 
+-            $raw_headers = preg_replace("/\r\n[ \t]+/", ' ', $raw_headers); // Unfold headers
+-            $raw_headers = explode("\r\n", $raw_headers);
++            $raw_headers = preg_replace("/\r?\n[ \t]+/", ' ', $raw_headers); // Unfold headers
++            $raw_headers = preg_split("\r?\n", $raw_headers);
+             foreach ($raw_headers as $value) {
+                 $name  = substr($value, 0, $pos = strpos($value, ':'));
+                 $value = ltrim(substr($value, $pos + 1));
+
+Diff finished.  Sat Sep 22 17:13:38 2007

Added: pear/php-net-pop3/trunk/debian/patches/pear-bug-4243-sasl-capabilities.dpatch
===================================================================
--- pear/php-net-pop3/trunk/debian/patches/pear-bug-4243-sasl-capabilities.dpatch	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/patches/pear-bug-4243-sasl-capabilities.dpatch	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pear-bug-4243-sasl-capabilities.dpatch by Mark A. Hershberger  <mhershberger at intrahealth.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up capability parsing code
+
+ at DPATCH@
+
+diff -ub t/Net_POP3-1.3.6/POP3.php\~ t/Net_POP3-1.3.6/POP3.php
+--- t/Net_POP3-1.3.6/POP3.php~	2005-04-04 22:17:41.000000000 -0400
++++ t/Net_POP3-1.3.6/POP3.php	2007-09-22 16:19:26.000000000 -0400
+@@ -286,20 +286,17 @@
+ 
+         for ($i = 0; $i < count($data); $i++) {
+ 
+-            $capa='';
+-            if (preg_match('/^([a-z,\-]+)( ((.*))|$)$/i', $data[$i], $matches)) {
++            list($capa, $arg) = explode(' ', $data[$i], 2);
++
++            if(isset($capa)) {
++                $capa = strtolower($capa);
+ 
+-                $capa=strtolower($matches[1]);
+                 switch ($capa) {
+-                    case 'implementation':
+-                        $this->_capability['implementation'] = $matches[3];
+-                        break;
+                     case 'sasl':
+-                        $this->_capability['sasl'] = preg_split('/\s+/', $matches[3]);
+-                        break;
+-                    default :
+-                        $this->_capability[$capa] = $matches[2];
++                    $this->_capability[$capa] = isset($arg) ? explode(' ', $arg) : array();
+                         break;
++                default:
++                    $this->_capability[$capa] = isset($arg) ? $arg : 1;
+                 }
+             }
+         }
+
+Diff finished.  Sat Sep 22 16:23:24 2007

Added: pear/php-net-pop3/trunk/debian/rules
===================================================================
--- pear/php-net-pop3/trunk/debian/rules	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/rules	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,89 @@
+#!/usr/bin/make -f
+
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+
+PEAR_LIBRARY_NAME ?= $(shell pear info package.xml | awk '/^Package / {print $$2}')
+PEAR ?= /usr/bin/pear
+TOP=debian/$(DEB_SOURCE_PACKAGE)
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	dpatch apply-all
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	dpatch deapply-all
+
+	dh_clean build-stamp configure-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/package.
+	cp package.xml $(PEAR_LIBRARY_NAME)-$(DEB_UPSTREAM_VERSION)
+	$(PEAR) -d include_path=/usr/share/php \
+		-d php_bin=/usr/bin/php \
+		-d bin_dir=/usr/bin \
+		-d php_dir=/usr/share/php \
+		-d data_dir=/usr/share/php/data \
+		-d doc_dir=/usr/share/php/docs \
+		-d test_dir=/usr/share/php/tests \
+		install -n -f -P $(TOP) $(PEAR_LIBRARY_NAME)-$(DEB_UPSTREAM_VERSION)/package.xml
+
+	# remove unwanted files
+	rm -f $(TOP)/usr/share/php/.filemap;
+	rm -f $(TOP)/usr/share/php/.lock;
+	rm -rf $(TOP)/usr/share/php/.channels;
+	rm -rf $(TOP)/usr/share/php/.depdblock;
+	rm -rf $(TOP)/usr/share/php/.depdb;
+	rm -rf $(TOP)/usr/share/php/.registry/.channel.pecl.php.net;
+	rm -rf $(TOP)/usr/share/php/.registry/.channel.__uri;
+	rm -rf $(TOP)/tmp
+
+	# remove duplicated files, these files are in /usr/share/doc/package
+	rm -rf $(TOP)/usr/share/php/tests \
+		$(TOP)/usr/share/php/docs
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installchangelogs 
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
+get-orig-source:
+	wget http://download.pear.php.net/package/$(PEAR_LIBRARY_NAME)-$(DEB_UPSTREAM_VERSION).tgz \
+		-O $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz


Property changes on: pear/php-net-pop3/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: pear/php-net-pop3/trunk/debian/svn-deblayout
===================================================================
--- pear/php-net-pop3/trunk/debian/svn-deblayout	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/svn-deblayout	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,3 @@
+origDir=../../upstream
+buildArea=../../build-area
+

Added: pear/php-net-pop3/trunk/debian/watch
===================================================================
--- pear/php-net-pop3/trunk/debian/watch	                        (rev 0)
+++ pear/php-net-pop3/trunk/debian/watch	2007-09-25 14:17:21 UTC (rev 899)
@@ -0,0 +1,2 @@
+version=3
+http://pear.php.net/package/Net_POP3 http://download.pear.php.net/package/Net_POP3-([\d.RC]+).tgz




More information about the Pkg-php-commits mailing list