On Mon, Oct 28, 2013 at 03:44:19PM PDT, Jason White wrote:
> The patch file you sent lists the file names you changed but lacks the diffs
> themselves. Could you take another look?
Whoops, thanks. I was initially checking that I didn't screw up the diff.
Attached.
> If you can, I would suggest moving this into a Git repository.
Sure can do, just not sure where to host it. I don't have a github account and
don't plan to get one, and the package is not technically an accessibility team
package at the moment, so I could put it up on my own webspace for now.
Luke
diff -urN dotconf-1.0.13/debian/changelog dotconf-1.3/debian/changelog
--- dotconf-1.0.13/debian/changelog 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/changelog 2013-10-28 15:23:48.403659642 -0700
@@ -1,3 +1,35 @@
+dotconf (1.3-1) UNRELEASED; urgency=low
+
+ [ Jason White ]
+ * New upstream release. (Closes: #637652)
+ * Add multi-arch support.
+ * Create a package for debugging symbols.
+ * Convert the character encoding of the copyright file to UTF8.
+ * Add copyright notice (in required form) to copyright file
+ and identify the current upstream source.
+ * Update dependencies.
+ * Remove dotconf-config(1) manual page as dotconf-config no longer
+ exists.
+ * Specify source format as 3.0 (quilt).
+ * Update standards-version to 3.9.4.
+
+ [ Luke Yelavich ]
+ * Remove obsolete postinst script
+ * Rename the dotconf library package to match the soname
+ * Update to new copyright format
+ * Added symbols file
+ * debian/rules: Remove multi-arch variable definition, debhelper 9
+ takes care of things already
+ * 0001-fix-possible-buffer-overflow-in-get_path.patch:
+ - Patch taken from upstream git to fix a possible buffer overflow
+ in get_path
+ * Remove the use of autoreconf, we do not currently change anything that
+ requires autotools files regeneration
+ * debian/rules: Add a get-orig-source rule, since upstream does not release
+ tarballs with autotools files generated
+
+ -- Jason White <ja...@jasonjgw.net> Tue, 30 Jul 2013 10:49:17 +1000
+
dotconf (1.0.13-3) unstable; urgency=low
* Correctly make use of realloc, to prevent applications using dotconf from
diff -urN dotconf-1.0.13/debian/compat dotconf-1.3/debian/compat
--- dotconf-1.0.13/debian/compat 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/compat 2013-10-28 11:47:01.000000000 -0700
@@ -1 +1 @@
-4
+9
diff -urN dotconf-1.0.13/debian/control dotconf-1.3/debian/control
--- dotconf-1.0.13/debian/control 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/control 2013-10-28 14:49:53.000000000 -0700
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Shane Wegner <sh...@debian.org>
-Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.5.8
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.4
Package: libdotconf-dev
Architecture: any
Section: libdevel
Priority: extra
-Depends: libdotconf1.0 (= ${Source-Version}), libc6-dev
+Depends: ${misc:Depends}, libdotconf0 (= ${binary:Version}), libc6-dev
Description: Configuration file parser library - development files
dot.conf is a simple-to-use and powerful configuration-file parser
library written in C. The configuration files created for dot.conf
@@ -24,11 +24,13 @@
This package contains the development files necessary to build
programs using the dotconf library.
-Package: libdotconf1.0
+Package: libdotconf0
Architecture: any
+Multi-arch: same
Section: libs
Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: multiarch-support
Description: Configuration file parser library - runtime files
dot.conf is a simple-to-use and powerful configuration-file parser
library written in C. The configuration files created for dot.conf
@@ -39,3 +41,24 @@
configuration options on-the-fly, a here-documents feature to pass
very long ARG_STR data to your app, and on-the-fly inclusion of
additional config files.
+
+Package: libdotconf0-dbg
+Architecture: any
+Multi-arch: same
+Section: debug
+Priority: extra
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdotconf0 (= ${binary:Version})
+Pre-Depends: multiarch-support
+Description: Configuration file parser library - runtime files
+ dot.conf is a simple-to-use and powerful configuration-file parser
+ library written in C. The configuration files created for dot.conf
+ look very similar to those used by the Apache Webserver. Even
+ Container-Directives known from httpd.conf can easily be used in the
+ exact same manner as for Apache-Modules. It supports various types of
+ arguments, dynamically loadable modules that create their own
+ configuration options on-the-fly, a here-documents feature to pass
+ very long ARG_STR data to your app, and on-the-fly inclusion of
+ additional config files.
+ .
+ This package contains the debugging symbols for libdotconf.
+
diff -urN dotconf-1.0.13/debian/copyright dotconf-1.3/debian/copyright
--- dotconf-1.0.13/debian/copyright 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/copyright 2013-10-28 11:47:01.000000000 -0700
@@ -1,13 +1,42 @@
-This package was debianized by Shane Wegner <sh...@cm.nu> on
-Thu, 20 Jan 2000 23:50:36 -0800.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: dotconf
+Source: https://github.com/williamh/dotconf
-It was downloaded from http://www.azzit.de/dotconf/
+Files: src/dotconf*
+Copyright: Copyright (C) 1999,2000,2001,2002 Lukas Schroeder <lu...@azzit.de>
+License: LGPL-2+
+ On Debian systems the full text of the GNU Library General Public License can
+ be found in the `/usr/share/common-licenses/LGPL-2' file.
-Upstream Author: lukas schröder <lu...@azzit.de>
+Files: src/readdir.*
+Copyright: Copyright (c) 2000 The Apache Software Foundation. All rights reserved.
+License: Apache-1.1
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ 3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+ 4. The names "Apache" and "Apache Software Foundation" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written
+ permission, please contact apa...@apache.org.
+ 5. Products derived from this software may not be called "Apache",
+ nor may "Apache" appear in their name, without prior written
+ permission of the Apache Software Foundation.
-Copyright:
+Files: debian/*
+Copyright: Copyright 2012, Luke Yelavich <them...@ubuntu.com>
+License: GPL-2
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
-You are free to distribute this software under the terms of the GNU Lesser
-General Public License. On Debian systems, the complete text of the GNU
-Lesser General Public License can be found in
-/usr/share/common-licenses/LGPL file.
diff -urN dotconf-1.0.13/debian/docs dotconf-1.3/debian/docs
--- dotconf-1.0.13/debian/docs 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/docs 1969-12-31 16:00:00.000000000 -0800
@@ -1,4 +0,0 @@
-NEWS
-README
-doc/dotconf-api.txt
-doc/dotconf-features.txt
diff -urN dotconf-1.0.13/debian/dotconf-config.1 dotconf-1.3/debian/dotconf-config.1
--- dotconf-1.0.13/debian/dotconf-config.1 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/dotconf-config.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,26 +0,0 @@
-.TH DOTCONF-CONFIG "1" "February 2003" "dotconf-config" "User Commands"
-.SH NAME
-dotconf-config \- manual page for dotconf-config
-.SH SYNOPSIS
-.B dotconf-config
-[\fIOPTION\fR]
-.SH DESCRIPTION
-Known values for OPTION are:
-.TP
-\fB\-\-prefix\fR=\fIDIR\fR
-change dotconf prefix [default /usr]
-.TP
-\fB\-\-libs\fR
-print library linking information
-.TP
-\fB\-\-cflags\fR
-print pre-processor and compiler flags
-.TP
-\fB\-\-pool\fR
-Print library link information for libpool.
-.TP
-\fB\-\-help\fR
-display this help and exit
-.TP
-\fB\-\-version\fR
-output version information
diff -urN dotconf-1.0.13/debian/libdotconf0.install dotconf-1.3/debian/libdotconf0.install
--- dotconf-1.0.13/debian/libdotconf0.install 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/libdotconf0.install 2013-10-28 11:47:01.000000000 -0700
@@ -0,0 +1,2 @@
+usr/lib/*/libdotconf.so.*
+
diff -urN dotconf-1.0.13/debian/libdotconf0.symbols dotconf-1.3/debian/libdotconf0.symbols
--- dotconf-1.0.13/debian/libdotconf0.symbols 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/libdotconf0.symbols 2013-10-28 11:54:59.000000000 -0700
@@ -0,0 +1,29 @@
+libdotconf.so.0 libdotconf0 #MINVER#
+ dotconf_callback@Base 1.0.13
+ dotconf_cleanup@Base 1.0.13
+ dotconf_command_loop@Base 1.0.13
+ dotconf_command_loop_until_error@Base 1.0.13
+ dotconf_continue_line@Base 1.0.13
+ dotconf_create@Base 1.0.13
+ dotconf_find_command@Base 1.0.13
+ dotconf_find_wild_card@Base 1.0.13
+ dotconf_free_command@Base 1.0.13
+ dotconf_get_here_document@Base 1.0.13
+ dotconf_get_next_line@Base 1.0.13
+ dotconf_handle_command@Base 1.0.13
+ dotconf_handle_question_mark@Base 1.0.13
+ dotconf_handle_star@Base 1.0.13
+ dotconf_handle_wild_card@Base 1.0.13
+ dotconf_invoke_command@Base 1.0.13
+ dotconf_is_wild_card@Base 1.0.13
+ dotconf_question_mark_match@Base 1.0.13
+ dotconf_read_arg@Base 1.0.13
+ dotconf_register_options@Base 1.0.13
+ dotconf_set_command@Base 1.0.13
+ dotconf_star_match@Base 1.0.13
+ dotconf_strcmp_from_back@Base 1.0.13
+ dotconf_substitute_env@Base 1.0.13
+ dotconf_warning@Base 1.0.13
+ dotconf_wild_card_cleanup@Base 1.0.13
+ get_cwd@Base 1.3
+ get_path@Base 1.3
diff -urN dotconf-1.0.13/debian/libdotconf1.0.files dotconf-1.3/debian/libdotconf1.0.files
--- dotconf-1.0.13/debian/libdotconf1.0.files 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/libdotconf1.0.files 1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-usr/lib/libdotconf-1.0.so.0
-usr/lib/libdotconf-1.0.so.0.10.4
diff -urN dotconf-1.0.13/debian/libdotconf1.0.postinst dotconf-1.3/debian/libdotconf1.0.postinst
--- dotconf-1.0.13/debian/libdotconf1.0.postinst 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/libdotconf1.0.postinst 1969-12-31 16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-test configure = "$1" && ldconfig
-
-#DEBHELPER#
diff -urN dotconf-1.0.13/debian/libdotconf-dev.docs dotconf-1.3/debian/libdotconf-dev.docs
--- dotconf-1.0.13/debian/libdotconf-dev.docs 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/libdotconf-dev.docs 2013-10-28 11:47:01.000000000 -0700
@@ -0,0 +1,3 @@
+README
+doc/dotconf-api.txt
+doc/dotconf-features.txt
diff -urN dotconf-1.0.13/debian/libdotconf-dev.install dotconf-1.3/debian/libdotconf-dev.install
--- dotconf-1.0.13/debian/libdotconf-dev.install 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/libdotconf-dev.install 2013-10-28 11:47:01.000000000 -0700
@@ -0,0 +1,5 @@
+usr/lib/*/libdotconf.so
+usr/lib/*/libdotconf.a
+usr/lib/*/pkgconfig
+usr/include
+
diff -urN dotconf-1.0.13/debian/libdotconf-dev.manpages dotconf-1.3/debian/libdotconf-dev.manpages
--- dotconf-1.0.13/debian/libdotconf-dev.manpages 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/libdotconf-dev.manpages 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-debian/dotconf-config.1
diff -urN dotconf-1.0.13/debian/patches/0001-fix-possible-buffer-overflow-in-get_path.patch dotconf-1.3/debian/patches/0001-fix-possible-buffer-overflow-in-get_path.patch
--- dotconf-1.0.13/debian/patches/0001-fix-possible-buffer-overflow-in-get_path.patch 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/patches/0001-fix-possible-buffer-overflow-in-get_path.patch 2013-10-28 13:57:15.000000000 -0700
@@ -0,0 +1,27 @@
+From 6382711e9b0060bbd0408df512e48b2ce9cdb3be Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hu...@gmail.com>
+Date: Tue, 22 Jun 2010 14:16:45 -0500
+Subject: [PATCH] fix possible buffer overflow in get_path
+
+If a pathname is longer than CFG_MAX_FILENAME, there was a possible
+buffer overflow when copying the path name.
+---
+ src/dotconf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dotconf.c b/src/dotconf.c
+index af553b3..7ba2001 100644
+--- a/src/dotconf.c
++++ b/src/dotconf.c
+@@ -1440,7 +1440,7 @@ char *get_path(char *name)
+ } else {
+ len = tmp - name + 1;
+ if (len > CFG_MAX_FILENAME)
+- len -= 1;
++ len = CFG_MAX_FILENAME;
+ }
+ snprintf(buf, len, "%s", name);
+ return buf;
+--
+1.8.3.2
+
diff -urN dotconf-1.0.13/debian/patches/series dotconf-1.3/debian/patches/series
--- dotconf-1.0.13/debian/patches/series 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/patches/series 2013-10-28 13:57:32.000000000 -0700
@@ -0,0 +1 @@
+0001-fix-possible-buffer-overflow-in-get_path.patch
diff -urN dotconf-1.0.13/debian/rules dotconf-1.3/debian/rules
--- dotconf-1.0.13/debian/rules 2013-10-28 15:09:50.000000000 -0700
+++ dotconf-1.3/debian/rules 2013-10-28 14:50:06.000000000 -0700
@@ -5,93 +5,19 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+version=$(shell dpkg-parsechangelog|sed -n -e 's/^Version: //p'|cut -d- -f1)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-# for f in $(CURDIR)/examples/*; do \
-# if [ -d $$f ]; then \
-# (cd $$f && make clean); fi; done
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install prefix=$(CURDIR)/debian/libdotconf-dev/usr
-
-
-# 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
- #
- # build libdotconf1.0 package by moving files from libdotconf-dev
- #
- dh_movefiles -plibdotconf1.0 \
- --sourcedir debian/libdotconf-dev
-
- dh_installdocs
- dh_installexamples examples/*
- dh_installman
- dh_undocumented dotconf-config.1
-# dh_installinfo
- dh_installchangelogs ChangeLog
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@
+override_dh_strip:
+ dh_strip --dbg-package=libdotconf0-dbg
+
+get-orig-source:
+ cd $(CURDIR); \
+ mkdir -p dotconf-git && cd dotconf-git; \
+ git clone git://github.com/williamh/dotconf.git; \
+ cd dotconf; \
+ git checkout -b $(version) v$(version); \
+ autoreconf -i && ./configure && make && make dist; \
+ cp dotconf-$(version).tar.gz $(CURDIR)/dotconf_$(version).orig.tar.gz; \
+ cd $(CURDIR) && rm -rf dotconf-git
diff -urN dotconf-1.0.13/debian/source/format dotconf-1.3/debian/source/format
--- dotconf-1.0.13/debian/source/format 1969-12-31 16:00:00.000000000 -0800
+++ dotconf-1.3/debian/source/format 2013-10-28 11:47:01.000000000 -0700
@@ -0,0 +1 @@
+3.0 (quilt)
