The following commit has been merged in the master branch:
commit 35f39b21a80e30079239d3cf679bd4d043b28d80
Author: Stephane Glondu <st...@glondu.net>
Date:   Tue Jun 4 08:31:16 2013 +0200

    Refresh patches

diff --git a/debian/patches/Avoid-shipping-GPL-license-text.patch 
b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
similarity index 100%
rename from debian/patches/Avoid-shipping-GPL-license-text.patch
rename to debian/patches/0001-Avoid-shipping-GPL-license-text.patch
diff --git a/debian/patches/Create-installation-directories.patch 
b/debian/patches/0002-Create-installation-directories.patch
similarity index 92%
rename from debian/patches/Create-installation-directories.patch
rename to debian/patches/0002-Create-installation-directories.patch
index 75bd18f..1da2156 100644
--- a/debian/patches/Create-installation-directories.patch
+++ b/debian/patches/0002-Create-installation-directories.patch
@@ -7,7 +7,7 @@ Subject: Create installation directories
 Signed-off-by: Stefano Zacchiroli <z...@debian.org>
 ---
  Makefile |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
 index ce83c7b..e47c8f8 100644
diff --git a/debian/patches/Do-not-install-apache.info-file.patch 
b/debian/patches/0003-Do-not-install-apache.info-file.patch
similarity index 89%
rename from debian/patches/Do-not-install-apache.info-file.patch
rename to debian/patches/0003-Do-not-install-apache.info-file.patch
index aa3e23d..1586987 100644
--- a/debian/patches/Do-not-install-apache.info-file.patch
+++ b/debian/patches/0003-Do-not-install-apache.info-file.patch
@@ -7,10 +7,10 @@ It is not needed with Apache 2.
 Signed-off-by: Stefano Zacchiroli <z...@debian.org>
 ---
  src/netcgi2-apache/Makefile.def |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index e93bae8..9ca5375 100644
+index 9efc603..6f6dfeb 100644
 --- a/src/netcgi2-apache/Makefile.def
 +++ b/src/netcgi2-apache/Makefile.def
 @@ -11,7 +11,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
diff --git a/debian/patches/Force-major-version-for-apache-to-2.patch 
b/debian/patches/0004-Force-major-version-for-apache-to-2.patch
similarity index 85%
rename from debian/patches/Force-major-version-for-apache-to-2.patch
rename to debian/patches/0004-Force-major-version-for-apache-to-2.patch
index cf6a55f..6164c3d 100644
--- a/debian/patches/Force-major-version-for-apache-to-2.patch
+++ b/debian/patches/0004-Force-major-version-for-apache-to-2.patch
@@ -9,13 +9,13 @@ apache2-mpm-worker (one of the packages shipping 
/usr/sbin/apache2)
 Signed-off-by: Stefano Zacchiroli <z...@upsilon.cc>
 ---
  configure |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 8bc9721..59ed591 100755
+index 501c633..3816f4d 100755
 --- a/configure
 +++ b/configure
-@@ -777,8 +777,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -833,8 +833,8 @@ if [ $enable_apache -gt 0 ]; then
        apache=`get_path apache`
      fi
  
diff --git a/debian/patches/Fix-upstream-cleaning-rules.patch 
b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
similarity index 98%
rename from debian/patches/Fix-upstream-cleaning-rules.patch
rename to debian/patches/0005-Fix-upstream-cleaning-rules.patch
index f7ef599..7fd5643 100644
--- a/debian/patches/Fix-upstream-cleaning-rules.patch
+++ b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
@@ -11,7 +11,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net>
  4 files changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/src/netcgi2-apache/Makefile.pre b/src/netcgi2-apache/Makefile.pre
-index ec90910..b39a595 100644
+index 4f2f44b..2c83034 100644
 --- a/src/netcgi2-apache/Makefile.pre
 +++ b/src/netcgi2-apache/Makefile.pre
 @@ -33,6 +33,5 @@ include $(TOP_DIR)/Makefile.rules
diff --git a/debian/patches/Add-rpath-to-Apache-module.patch 
b/debian/patches/Add-rpath-to-Apache-module.patch
deleted file mode 100644
index 0d68abe..0000000
--- a/debian/patches/Add-rpath-to-Apache-module.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Stefano Zacchiroli <z...@debian.org>
-Date: Tue, 6 Oct 2009 15:34:00 +0200
-Subject: Add rpath to Apache module
-
-Add rpath to Apache module, pointing to `ocamlc -where`. Rationale:
-ensure libcamlrun_shared.so can be found.
-
-Signed-off-by: Stefano Zacchiroli <z...@debian.org>
----
- src/netcgi2-apache/Makefile.def |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index 7b1bb61..e93bae8 100644
---- a/src/netcgi2-apache/Makefile.def
-+++ b/src/netcgi2-apache/Makefile.def
-@@ -50,7 +50,7 @@ endif
- ### Only works with OCaml >= 3.11 on plafforms where PIC differs from non-PIC
- ### See http://caml.inria.fr/mantis/view.php?id=3866
- mod_netcgi_apache.so: $(MOD_OBJECTS)
--      $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(patsubst 
-lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
-+      $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) 
-Wl,--rpath,$(APACHE_OCAMLLIBDIR) $(patsubst 
-lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
-       test -f .libs/$@ && cp .libs/$@ .
- 
- netcgi_apache_mod.lo: netcgi_apache_mod.o
--- 
diff --git a/debian/patches/Fix-compilation-with-Apache-2.4.patch 
b/debian/patches/Fix-compilation-with-Apache-2.4.patch
deleted file mode 100644
index e4929ba..0000000
--- a/debian/patches/Fix-compilation-with-Apache-2.4.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Gerd Stolpmann <g...@gerd-stolpmann.de>
-Date: Tue, 14 May 2013 08:12:02 +0200
-Subject: Fix compilation with Apache 2.4
-
-Origin: upstream, r1844
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666825
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- src/netcgi2-apache/Makefile.def |    2 +-
- src/netcgi2-apache/Makefile.pre |    2 +-
- src/netcgi2-apache/apache.c     |   22 ++++++++++++++++++----
- 3 files changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index 9ca5375..cfbfb81 100644
---- a/src/netcgi2-apache/Makefile.def
-+++ b/src/netcgi2-apache/Makefile.def
-@@ -1,6 +1,6 @@
- TOP_DIR=../..
- 
--PKGNAME = netcgi_apache
-+PKGNAME = netcgi2-apache
- # Keep the name in sync with the one on handler.c :
- BUILD_EXTRA = mod_netcgi_apache.so
- 
-diff --git a/src/netcgi2-apache/Makefile.pre b/src/netcgi2-apache/Makefile.pre
-index b39a595..2c83034 100644
---- a/src/netcgi2-apache/Makefile.pre
-+++ b/src/netcgi2-apache/Makefile.pre
-@@ -1,7 +1,7 @@
- TOP_DIR=../..
- 
- PRE = 1
--PKGNAME = netcgi_apache
-+PKGNAME = netcgi2-apache
- GENERATE = config.h netcgi_apache_mod.ml META 500netcgi_apache.info
- 
- INSTALL_EXTRA = netcgi_modtpl.cma 500netcgi_apache.info \
-diff --git a/src/netcgi2-apache/apache.c b/src/netcgi2-apache/apache.c
-index 8dae50a..e2f75cc 100644
---- a/src/netcgi2-apache/apache.c
-+++ b/src/netcgi2-apache/apache.c
-@@ -34,6 +34,7 @@
- #include <http_config.h>
- #include <http_protocol.h>
- #include <http_request.h>
-+#include <http_core.h>
- 
- #if APACHE2
- #include <apr_strings.h>
-@@ -200,9 +201,9 @@ netcgi2_apache_server_is_virtual(value sv)
- 
- /*----- Connection structure. -----*/
- 
--#define CONNECTION(field) \
-+#define CONNECTION(suffix,field)                \
- CAMLprim value                                  \
--netcgi2_apache_connection_ ## field (value cv)        \
-+netcgi2_apache_connection_ ## suffix (value cv)        \
- {                                               \
-   CAMLparam1 (cv);                              \
-   conn_rec *c = Conn_rec_val (cv);              \
-@@ -212,8 +213,21 @@ netcgi2_apache_connection_ ## field (value cv)        \
-     raise_not_found ();                         \
- }
- 
--CONNECTION(remote_ip)
--CONNECTION(remote_host)
-+#if AP_SERVER_MAJORVERSION_NUMBER == 1
-+CONNECTION(remote_ip, remote_ip)
-+#elsif AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORERSION_NUMBER < 3
-+CONNECTION(remote_ip, remote_ip)
-+#else
-+/* Apache-2.4 and up: remote_ip is now available in two variants:
-+   client_ip is the IP of the client (possibly a proxy), and 
-+   useragent_ip is the IP of the user agent (by trusting an http field
-+   that was added by the proxy if there is a proxy)
-+*/
-+CONNECTION(remote_ip, client_ip)
-+#endif
-+
-+
-+CONNECTION(remote_host, remote_host)
- 
- /*----- Request structure. -----*/
- 
--- 
diff --git a/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch 
b/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
deleted file mode 100644
index ba63bbc..0000000
--- a/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stefano Zacchiroli <z...@debian.org>
-Date: Tue, 6 Oct 2009 15:32:48 +0200
-Subject: Link against the PIC version of libcamlrun
-
-Signed-off-by: Stefano Zacchiroli <z...@debian.org>
----
- src/netcgi2-apache/Makefile.def |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index f191946..7b1bb61 100644
---- a/src/netcgi2-apache/Makefile.def
-+++ b/src/netcgi2-apache/Makefile.def
-@@ -50,7 +50,7 @@ endif
- ### Only works with OCaml >= 3.11 on plafforms where PIC differs from non-PIC
- ### See http://caml.inria.fr/mantis/view.php?id=3866
- mod_netcgi_apache.so: $(MOD_OBJECTS)
--      $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(APACHE_OCAMLLIBS)
-+      $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(patsubst 
-lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
-       test -f .libs/$@ && cp .libs/$@ .
- 
- netcgi_apache_mod.lo: netcgi_apache_mod.o
--- 
diff --git 
a/debian/patches/ocamlnet-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-.patch 
b/debian/patches/ocamlnet-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-.patch
deleted file mode 100644
index 2b0f654..0000000
--- a/debian/patches/ocamlnet-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Guillem Jover <guil...@hadrons.org>
-Date: Tue, 18 Dec 2012 18:25:47 +0100
-Subject: ocamlnet: Set FD_CLOEXEC correctly using F_SETFD not F_SETFL
-
-Using that value on F_SETFL is just wrong, and might make the call fail
-on some systems, as it's requesting to set an undetermined flag. For
-example on GNU/* FD_CLOEXEC has value 1, which matches with O_WRONLY.
-
-This might cause the code to at least leak file descriptors, and at worst
-to terminate execution.
-
-Signed-off-by: Stephane Glondu <st...@glondu.net>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696279
----
- src/netsys/netsys_c_poll.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/netsys/netsys_c_poll.c b/src/netsys/netsys_c_poll.c
-index d5c4f07..ee88a02 100644
---- a/src/netsys/netsys_c_poll.c
-+++ b/src/netsys/netsys_c_poll.c
-@@ -225,7 +225,7 @@ CAMLprim value netsys_create_event_aggreg(value cancelv)
- #ifdef USABLE_EPOLL
-     fd = epoll_create(128);
-     if (fd == -1) uerror("epoll_create", Nothing);
--    code = fcntl(fd, F_SETFL, FD_CLOEXEC);
-+    code = fcntl(fd, F_SETFD, FD_CLOEXEC);
-     if (code == -1) {
-       e = errno;
-       close(fd);
-@@ -245,7 +245,7 @@ CAMLprim value netsys_create_event_aggreg(value cancelv)
-           close(fd);
-           unix_error(e, "eventfd", Nothing);
-       };
--      code = fcntl(cancel_fd, F_SETFL, FD_CLOEXEC);
-+      code = fcntl(cancel_fd, F_SETFD, FD_CLOEXEC);
-       if (code == -1) {
-           e = errno;
-           close(fd);
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 216033f..fe242fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
-Link-against-the-PIC-version-of-libcamlrun.patch
-Add-rpath-to-Apache-module.patch
-Avoid-shipping-GPL-license-text.patch
-Create-installation-directories.patch
-Do-not-install-apache.info-file.patch
-Force-major-version-for-apache-to-2.patch
-Fix-upstream-cleaning-rules.patch
-ocamlnet-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-.patch
-Fix-compilation-with-Apache-2.4.patch
+0001-Avoid-shipping-GPL-license-text.patch
+0002-Create-installation-directories.patch
+0003-Do-not-install-apache.info-file.patch
+0004-Force-major-version-for-apache-to-2.patch
+0005-Fix-upstream-cleaning-rules.patch

-- 
ocamlnet packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to