[Pkg-ocaml-maint-commits] [SCM] mysql-ocaml packaging branch, master, updated. debian/1.0.4-6-4-gd68768b
Mehdi Dogguy
mehdi at debian.org
Sat Oct 31 22:39:51 UTC 2009
The following commit has been merged in the master branch:
commit 911b4d1deb81ff6280cd3aa0708307adf09aa63f
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sat Oct 31 22:40:37 2009 +0100
Use new features of dh-ocaml 0.9
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..25f8895
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt for patching the source.
+
+Please consider reading quilt manpage to patch the source.
+
+ -- Mehdi Dogguy <mehdi at debian.org>, Sat, 31 Oct 2009 23:00:13 +0100
diff --git a/debian/changelog b/debian/changelog
index 0a27302..43af430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ mysql-ocaml (1.0.4-7) unstable; urgency=low
* Set maintainer as "Debian OCaml Maintainers" and Samuel as Uploader
(with Sam's blessing).
+ * Use new features of dh-ocaml 0.9
+ * Set section to ocaml
+ * Convert patches to quilt format
+ * Bump standards version to 3.8.3
+ - Add a debian/README.source
-- Mehdi Dogguy <mehdi at debian.org> Sat, 31 Oct 2009 22:28:40 +0100
diff --git a/debian/control b/debian/control
index ee4e24a..6cba0da 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,30 @@
Source: mysql-ocaml
-Section: devel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders:
Samuel Mimram <smimram at debian.org>,
Mehdi Dogguy <mehdi at debian.org>
-Build-Depends: debhelper (>= 7), libmysqlclient15-dev, dh-ocaml (>= 0.2), ocaml-nox (>= 3.11), camlp4 (>= 3.11), ocaml-findlib (>= 1.2.4), dpatch
-Standards-Version: 3.8.0
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ libmysqlclient15-dev,
+ dh-ocaml (>= 0.9),
+ ocaml-nox (>= 3.11),
+ camlp4 (>= 3.11),
+ ocaml-findlib (>= 1.2.4),
+ quilt (>= 0.46-7~)
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git
Package: libmysql-ocaml
-Section: libs
Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ ${ocaml:Provides}
Description: OCaml bindings for MySql
This OCaml library interfaces the MySql C library. It can be used to access
and modify MySql databases from OCaml programs.
@@ -21,9 +32,14 @@ Description: OCaml bindings for MySql
This package contains only the shared runtime stub libraries.
Package: libmysql-ocaml-dev
-Section: libdevel
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libmysqlclient15-dev, libmysql-ocaml (= ${binary:Version})
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libmysqlclient15-dev
+Provides:
+ ${ocaml:Provides}
Description: OCaml bindings for MySql
This OCaml library interfaces the MySql C library. It can be used to access
and modify MySql databases from OCaml programs.
diff --git a/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch b/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
new file mode 100644
index 0000000..e552ad6
--- /dev/null
+++ b/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
@@ -0,0 +1,31 @@
+From: Samuel Mimram <smimram at debian.org>
+Date: Sat, 31 Oct 2009 22:43:37 +0100
+Subject: [PATCH] Fix creation of insecure temporary files
+
+shtool creates temporary files in an insecure manner, which can be
+exploited through symlink attacks. Please see these URLs for details:
+http://www.zataz.net/adviso/shtool-05252005.txt
+http://bugs.gentoo.org/show_bug.cgi?id=93782
+---
+ etc/shtool | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/etc/shtool b/etc/shtool
+index 1253148..9a793da 100755
+--- a/etc/shtool
++++ b/etc/shtool
+@@ -379,6 +379,13 @@ if [ ".$gen_tmpfile" = .yes ]; then
+ fi
+ fi
+ tmpfile="$tmpdir/.shtool.$$"
++ if mkdir "$tmpdir/.shtool.$$"; then
++ tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
++ else
++ echo "$msgprefix:Error: failed to create temporary file" 1>&2
++ exit 1
++ fi
++ tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
+ rm -f $tmpfile >/dev/null 2>&1
+ touch $tmpfile
+ fi
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d9a3f1c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-shtool_tempfile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4bf9834
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-creation-of-insecure-temporary-files.patch
diff --git a/debian/patches/shtool_tempfile.dpatch b/debian/patches/shtool_tempfile.dpatch
deleted file mode 100755
index 9e675b5..0000000
--- a/debian/patches/shtool_tempfile.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## shtool_tempfile.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: shtool creates temporary files in an insecure manner, which can be
-## DP: exploited through symlink attacks. Please see these URLs for details:
-## DP: http://www.zataz.net/adviso/shtool-05252005.txt
-## DP: http://bugs.gentoo.org/show_bug.cgi?id=93782
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./etc/shtool /tmp/dpep-work.f6mb29/mysql-ocaml-1.0.3/etc/shtool
---- ./etc/shtool 2004-01-27 20:46:36.000000000 +0100
-+++ /tmp/dpep-work.f6mb29/mysql-ocaml-1.0.3/etc/shtool 2005-07-18 23:52:08.000000000 +0200
-@@ -378,7 +378,13 @@
- tmpdir="$TEMPDIR"
- fi
- fi
-- tmpfile="$tmpdir/.shtool.$$"
-+ if mkdir "$tmpdir/.shtool.$$"; then
-+ tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
-+ else
-+ echo "$msgprefix:Error: failed to create temporary file" 1>&2
-+ exit 1
-+ fi
-+ tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
- rm -f $tmpfile >/dev/null 2>&1
- touch $tmpfile
- fi
diff --git a/debian/rules b/debian/rules
index 4c94c70..79500a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,8 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# We want to use dpatch
-include /usr/share/dpatch/dpatch.make
include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
@@ -21,63 +17,32 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-config.status: configure
- dh_testdir
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-build: ocamlinit patch-stamp build-stamp
-build-stamp: config.status
- dh_testdir
-
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
$(MAKE)
ifneq ($(OCAML_OPT_ARCH),)
$(MAKE) opt
endif
- touch build-stamp
-
-clean: unpatch ocamlinit-clean
- dh_testdir
- dh_testroot
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
rm -f build-stamp
-
[ ! -f Makefile ] || $(MAKE) clean
rm -f config.log config.status Makefile
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
mkdir -p $(DESTDIR)
$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp --list-missing
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+%:
+ dh --with quilt,ocaml $@
--
mysql-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list