[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 15295d92a61ba77dd3e3a3b0af2980d90446c0df
Author: Stephane Glondu 
Date:   Tue May 7 14:08:59 2013 +0200

Bump Standards-Version to 3.9.4

diff --git a/debian/control b/debian/control
index 6753590..2439a19 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libcryptgps-ocaml-dev (>= 0.2.1-7~),
  libssl-ocaml-dev (>= 0.4.3-3~),
  apache2-prefork-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://projects.camlcity.org/projects/ocamlnet.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlnet.git

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit d87b1ddc1b6d7b60b06c87963b2a0abcbd4d110c
Author: Stephane Glondu 
Date:   Tue May 7 14:32:53 2013 +0200

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 4bd5a08..cb95d2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ocamlnet (3.6.3-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Fix incorrect use of F_SETFL with FD_CLOEXEC, thanks to Guillem Jover
+(Closes: #696279)
+  * Update copyright file and use format version 1.0
+  * Bump Standards-Version to 3.9.4
 
- -- Stéphane Glondu   Tue, 07 May 2013 12:31:42 +0200
+ -- Stéphane Glondu   Tue, 07 May 2013 14:11:09 +0200
 
 ocamlnet (3.5.1-1) unstable; urgency=low
 

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 13dc47e0f9e0df1ea334c916c600b88c1167e985
Author: Stephane Glondu 
Date:   Tue May 7 14:41:52 2013 +0200

Fix incorrect use of F_SETFL with FD_CLOEXEC (Closes: #696279)

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
new file mode 100644
index 000..2b0f654
--- /dev/null
+++ b/debian/patches/ocamlnet-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-.patch
@@ -0,0 +1,40 @@
+From: Guillem Jover 
+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 
+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 ddf7eea..7b00d23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ 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

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 474df494b74433eec109afc01dc29bb9925659c9
Author: Stephane Glondu 
Date:   Tue May 7 14:08:46 2013 +0200

Rewrite copyright file, in format version 1.0

diff --git a/debian/copyright b/debian/copyright
index 857bf41..ad23ac8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,78 @@
-This package was debianized by Stefano Zacchiroli  on
-Wed,  8 May 2002 00:27:44 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Packaged-By: Stefano Zacchiroli 
+Packaged-Date: Wed,  8 May 2002 00:27:44 +0200.
+Source: http://projects.camlcity.org/projects/ocamlnet.html
+Upstream-Contact: Gerd Stolpmann 
 
-It was downloaded from: http://ocamlnet.sourceforge.net
+Files: *
+Copyright: 2001-2013, Gerd Stolpmann and others
+License: ocamlnet
 
-Upstream Authors:
-  Gerd Stolpmann 
-  Patrick Doane 
+Files: src/netcgi2-apache/*.c src/netcgi2-apache/*.h src/netcgi2-apache/*.in
+Copyright: 2003-2007, Merjis Ltd. and Christophe Troestler
+License: LGPL-2+
 
-Copyright (for every part of the library except Nethttpd, see below for
-Nethttp Copyright):
+Files: src/nethttpd*
+Copyright: 2005, Baretta s.r.l. and Gerd Stolpmann
+License: GPL-2+
 
-  Copyright (c) 2001 Patrick Doane and Gerd Stolpmann
+Files: src/netsys/netsys_c_win32.c src/netsys/unixsupport_w32.c
+Copyright: 1996, Inria
+License: LGPL-exception
 
-  This software is provided 'as-is', without any express or
-  implied warranty. In no event will the authors be held liable
-  for any damages arising from the use of this software.
+Files: debian/*
+Copyright: 2002-2009, Stefano Zacchiroli
+   2009-2013, Stéphane Glondu
+License: ocamlnet
 
-  Permission is granted to anyone to use this software for any
-  purpose, including commercial applications, and to alter it and
-  redistribute it freely, subject to the following restrictions:
+License: ocamlnet
+ This software is provided 'as-is', without any express or
+ implied warranty. In no event will the authors be held liable
+ for any damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you
+ must not claim that you wrote the original software. If you use
+ this software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
 
-  1. The origin of this software must not be misrepresented; you
-  must not claim that you wrote the original software. If you use
-  this software in a product, an acknowledgment in the product
-  documentation would be appreciated but is not required.
+License: GPL-2+
+ This software is distributed under the terms of the GNU General
+ Public License (GPL), version 2 or above. On Debian systems a copy of
+ the license is available at `/usr/share/common-licenses/GPL-2'.
 
-  2. Altered source versions must be plainly marked as such, and
-  must not be misrepresented as being the original software.
-
-  3. This notice may not be removed or altered from any source
-  distribution.
-
-Copyright (for Nethttpd):
-
-  Nethttp is distributed under the terms of the GNU General Public
-  License (GPL), version 2 or above. On Debian systems a copy of the
-  license is available at `/usr/share/common-licenses/GPL-2'.
+License: LGPL-2+
+ This software is distributed under the terms of the GNU Library
+ General Public License (LGPL), version 2 or above. On Debian systems a
+ copy of the license is available at
+ `/usr/share/common-licenses/LGPL-2'.
 
+License: LGPL-exception
+ This software is distributed under the terms of the GNU Library
+ General Public License (LGPL), with the following special exception:
+ .
+ As a special exception to the GNU Library General Public License, you
+ may link, statically or dynamically, a "work that uses the Library"
+ with a publicly distributed version of the Library to produce an
+ executable file containing portions of the Library, and distribute
+ that executable file under terms of your choice, without any of the
+ additional requirements listed in clause 6 of the GNU Library General
+ Public License.  By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed by INRIA, or a
+ modified version of the Library that is distributed under the
+ conditions defined in clause 3 of the GNU Library General Public
+ License.  This exception does not however invalidate any other reasons
+ why the executable file might be covered by the GNU Library General
+ Public License.
+ .
+ On Debian systems, the full

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 25de24fad74b66a4246c665e19c00a1d3d24f798
Author: Stephane Glondu 
Date:   Tue May 7 12:34:44 2013 +0200

Commit files removed by upstream cleaning rule

diff --git a/src/rpc-generator/config.ml b/src/rpc-generator/config.ml
deleted file mode 100644
index b713c9f..000
--- a/src/rpc-generator/config.ml
+++ /dev/null
@@ -1 +0,0 @@
-let cpp = "cpp";;

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 1985ac8b795d7e6dab5aea18fec2e2a2b07a3350
Author: Stephane Glondu 
Date:   Tue May 7 12:32:00 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 6d2c3fb..4bd5a08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocamlnet (3.6.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu   Tue, 07 May 2013 12:31:42 +0200
+
 ocamlnet (3.5.1-1) unstable; urgency=low
 
   * New upstream release

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 5b6abdee21260eaf318f528af632847d02a5139d
Author: Stephane Glondu 
Date:   Tue May 7 13:12:51 2013 +0200

New netstring-pcre findlib package, add -enable-pcre config option

Note: the module was already there before, but part of netstring.

diff --git a/debian/README.Debian b/debian/README.Debian
index 26d72af..c333e51 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -48,6 +48,7 @@ describes in which Debian package a given Ocamlnet library 
can be found:
netplex   libocamlnet-ocaml{,-dev}
netshmlibocamlnet-ocaml{,-dev}
netstring libocamlnet-ocaml{,-dev}
+   netstring-pcrelibocamlnet-ocaml{,-dev}
netsyslibocamlnet-ocaml{,-dev}
pop   libocamlnet-ocaml{,-dev}
rpc   libocamlnet-ocaml{,-dev}
@@ -60,7 +61,7 @@ describes in which Debian package a given Ocamlnet library 
can be found:
smtp  libocamlnet-ocaml{,-dev}
--
 
- -- Stefano Zacchiroli   Wed,  3 Jan 2007 16:17:34 +0100
+ -- Stéphane Glondu   Tue, 07 May 2013 13:57:52 +0200
 
 Debian GNU/kFreeBSD and GNU/Hurd ports
 ==
diff --git a/debian/libocamlnet-ocaml-dev.install.in 
b/debian/libocamlnet-ocaml-dev.install.in
index f394cc9..946dc92 100644
--- a/debian/libocamlnet-ocaml-dev.install.in
+++ b/debian/libocamlnet-ocaml-dev.install.in
@@ -9,6 +9,7 @@
 @OCamlStdlibDir@/netplex   @OCamlStdlibDir@
 @OCamlStdlibDir@/netshm@OCamlStdlibDir@
 @OCamlStdlibDir@/netstring @OCamlStdlibDir@
+@OCamlStdlibDir@/netstring-pcre@OCamlStdlibDir@
 @OCamlStdlibDir@/netsys@OCamlStdlibDir@
 @OCamlStdlibDir@/pop   @OCamlStdlibDir@
 @OCamlStdlibDir@/rpc-auth-dh   @OCamlStdlibDir@
diff --git a/debian/rules b/debian/rules
index 4134d3d..04a423f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ CFGFLAGS += -enable-gtk2 -enable-ssl
 CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh
 CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
 CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
+CFGFLAGS += -enable-pcre
 
 %:
dh $@ --with ocaml

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 288a2068dddedabc7b5186f57e45a603775b645f
Author: Stephane Glondu 
Date:   Tue May 7 13:30:53 2013 +0200

Fix upstream cleaning rules

diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 2879744..000
--- a/debian/clean
+++ /dev/null
@@ -1,13 +0,0 @@
-src/netcgi2-apache/netcgi_apache_mod.cds
-src/netsys/configtests/atfunctions
-src/netsys/configtests/fchdir
-src/netsys/configtests/fdopendir
-src/netsys/configtests/ocaml_fancy_page_tables
-src/netsys/configtests/posix_fadvise
-src/netsys/configtests/posix_fadvise.tmp
-src/netsys/configtests/posix_fallocate
-src/netsys/configtests/posix_fallocate.tmp
-src/netsys/configtests/posix_memalign
-src/netsys/configtests/posix_pthread
-src/netsys/configtests/posix_sem
-src/netsys/configtests/syslog
diff --git a/debian/patches/Fix-upstream-cleaning-rules.patch 
b/debian/patches/Fix-upstream-cleaning-rules.patch
new file mode 100644
index 000..f7ef599
--- /dev/null
+++ b/debian/patches/Fix-upstream-cleaning-rules.patch
@@ -0,0 +1,64 @@
+From: Stephane Glondu 
+Date: Tue, 7 May 2013 13:54:27 +0200
+Subject: Fix upstream cleaning rules
+
+Signed-off-by: Stephane Glondu 
+---
+ src/netcgi2-apache/Makefile.pre |5 ++---
+ src/netsys/Makefile |5 +++--
+ src/netsys/Makefile.pre |4 +++-
+ src/rpc-auth-local/Makefile.pre |3 +++
+ 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
+--- a/src/netcgi2-apache/Makefile.pre
 b/src/netcgi2-apache/Makefile.pre
+@@ -33,6 +33,5 @@ include $(TOP_DIR)/Makefile.rules
+ CLEAN_LIST += $(wildcard *.so) $(wildcard *.lo) $(wildcard *.slo) \
+   $(wildcard *.la) config.h netcgi_apache_mod.ml 500netcgi_apache.info
+ 
+-clean::
+-  test -d .libs && $(RM) -rf .libs/
+-
++distclean::
++  $(RM) -rf .libs/ *.cds
+diff --git a/src/netsys/Makefile b/src/netsys/Makefile
+index 452aab2..8cf7994 100644
+--- a/src/netsys/Makefile
 b/src/netsys/Makefile
+@@ -98,7 +98,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+ 
+ 
+ clean::
+-  rm -f configtests/*.o configtests/*.err
+-  rm -f configtests/posix_shm
++  rm -f configtests/*.o configtests/*.err configtests/*.tmp 
configtests/*.cm*
++  find configtests -type f -executable -delete
++  rm -rf tmp
+ 
+ include depend
+diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
+index e00996e..cf340c3 100644
+--- a/src/netsys/Makefile.pre
 b/src/netsys/Makefile.pre
+@@ -17,4 +17,6 @@ include $(TOP_DIR)/Makefile.rules
+ distclean::
+   rm -f Makefile.conf config.h
+   rm -f configtests/*.cmi configtests/*.cmo configtests/*.o
+-  rm -f configtests/*.err configtests/posix_shm
++  rm -f configtests/*.err configtests/*.tmp configtests/*.cm*
++  find configtests -type f -executable -delete
++  rm -rf tmp
+diff --git a/src/rpc-auth-local/Makefile.pre b/src/rpc-auth-local/Makefile.pre
+index 29c1606..cd6e8fc 100644
+--- a/src/rpc-auth-local/Makefile.pre
 b/src/rpc-auth-local/Makefile.pre
+@@ -5,3 +5,6 @@ PKGNAME = rpc-auth-local
+ GENERATE = META
+ 
+ include $(TOP_DIR)/Makefile.rules
++
++distclean::
++  rm -f config.h configtests/*.err configtests/*.o configtests/*.cm*
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c146caa..ddf7eea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ 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
diff --git a/debian/rules b/debian/rules
index 04a423f..08fca02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,11 +34,6 @@ override_dh_auto_build:
 override_dh_auto_install:
$(MAKE) install DESTDIR=$(DESTDIR)
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-   dh_auto_clean
-   rm -Rf src/netcgi2-apache/.libs/
-
 .PHONY: override_dh_install
 override_dh_install:
dh_install --fail-missing -X.so.owner

-- 
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

[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-13-gd87b1dd

2013-05-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 35f4d1f548d4045ab6e75ed926bc9b19bccbc935
Merge: d0acdeca6c62f2560faeef6d5014fd5ddb60c932 
01a97ea7e3773ce607d88002d1578c909e771fd1
Author: Stephane Glondu 
Date:   Tue May 7 12:31:31 2013 +0200

Merge tag 'upstream/3.6.3'

Upstream version 3.6.3

Conflicts:
src/netstring/nethttp.ml
src/netsys/config.h


-- 
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