author | Sebastian Harl <sh@tokkee.org> | |
Sun, 17 Sep 2006 21:06:28 +0000 (23:06 +0200) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Sun, 17 Sep 2006 21:06:28 +0000 (23:06 +0200) |
Adopted cadaver 0.22.2-1.1 from Bernd Eckenfels.
15 files changed:
configure.diff | [new file with mode: 0644] | patch | blob |
debian/README.debian | [new file with mode: 0644] | patch | blob |
debian/changelog | [new file with mode: 0644] | patch | blob |
debian/control | [new file with mode: 0644] | patch | blob |
debian/copyright | [new file with mode: 0644] | patch | blob |
debian/dirs | [new file with mode: 0644] | patch | blob |
debian/manpage.1.ex | [new file with mode: 0644] | patch | blob |
debian/menu | [new file with mode: 0644] | patch | blob |
debian/postinst | [new file with mode: 0644] | patch | blob |
debian/postrm | [new file with mode: 0644] | patch | blob |
debian/rules | [new file with mode: 0755] | patch | blob |
lib/glob.c.diff | [new file with mode: 0644] | patch | blob |
libneon/ne_locks.c.diff | [new file with mode: 0644] | patch | blob |
libneon/ne_request.c.diff | [new file with mode: 0644] | patch | blob |
macros/neon.m4.diff | [new file with mode: 0644] | patch | blob |
diff --git a/configure.diff b/configure.diff
--- /dev/null
+++ b/configure.diff
@@ -0,0 +1,11 @@
+--- cadaver-0.22.2.orig/configure
++++ cadaver-0.22.2/configure
+@@ -15652,7 +15652,7 @@
+ if test "$enable_warnings" = "yes"; then
+ case $GCC:`uname` in
+ yes:*)
+- CFLAGS="$CFLAGS -Wall -ansi-pedantic -Wmissing-declarations -Winline -Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align -Wbad-function-cast -Wimplicit-prototypes -Wformat-security"
++ CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Winline -Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align -Wbad-function-cast -Wformat-security"
+ if test -z "$with_ssl" -o "$with_ssl" = "no"; then
+ # OpenSSL headers fail strict prototypes checks
+ CFLAGS="$CFLAGS -Wstrict-prototypes"
diff --git a/debian/README.debian b/debian/README.debian
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,9 @@
+cadaver for Debian
+----------------------
+
+warning, you should not compile this package if libncurses4-dev is
+installed.
+
+Only the installation of the menu entry into Apps/Net is debian specific.
+
+Bernd Eckenfels <ecki@lina.inka.de>, Thu, 6 Jan 2000 09:39:32 +0100
diff --git a/debian/changelog b/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,134 @@
+cadaver (0.22.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.0. Closes: #258559, #294290.
+
+ -- Andreas Barth <aba@not.so.argh.org> Sun, 31 Jul 2005 08:56:22 +0200
+
+cadaver (0.22.2-1) unstable; urgency=low
+
+ * new upstream version
+ * this is the official fix for
+ libneon 0.24.6 [src/ne_dates.c, CAN-2004-0398]
+ * removed strange gcc option -Wimplicit-prototypes (may fix #258559)
+
+ -- Bernd Eckenfels <ecki@debian.org> Thu, 23 Sep 2004 00:34:58 +0200
+
+cadaver (0.22.1-3) unstable; urgency=high
+
+ * Applied part of an upstream patch by Joe Orton <joe@manyfish.co.uk> to
+ correct the weekdays buffer to properly fix a potential stack overflow
+ via revision date in REPORT query [src/ne_dates.c, CAN-2004-0398]
+
+ -- Bernd Eckenfels <ecki@debian.org> Tue, 18 May 2004 14:30:34 +0200
+
+cadaver (0.22.1-2) unstable; urgency=high
+
+ * new upstream version (Closes: Bug #215952)
+ * fixes format string vulnerability in libneon. (Closes: Bug #244113)
+
+ -- Bernd Eckenfels <ecki@debian.org> Sat, 17 Apr 2004 03:04:40 +0200
+
+cadaver (0.21.0-1) unstable; urgency=low
+
+ * new upstream version
+ * still no GNU TLS Support. Porters welcome
+
+ -- Bernd Eckenfels <ecki@debian.org> Wed, 26 Feb 2003 04:08:11 +0100
+
+cadaver (0.20.5-3) unstable; urgency=low
+
+ * Merry X-MESS Edition II
+ * fixed description (no SSL support)
+
+ -- Bernd Eckenfels <ecki@debian.org> Thu, 20 Feb 2003 23:01:55 +0100
+
+cadaver (0.20.5-2) unstable; urgency=low
+
+ * Merry X-MESS Edition
+ * remove SSL support (Closes: Bug #163583)
+ NOTE: I RFA-ed this package, if you port it o GNU TLS you get it!
+
+ -- Bernd Eckenfels <ecki@debian.org> Mon, 23 Dec 2002 17:37:10 +0100
+
+cadaver (0.20.5-1) unstable; urgency=low
+
+ * new upstream version (Closes: Bug #156829, #131307)
+ * enable .netrc usage (Closes: Bug #142440)
+
+ -- Bernd Eckenfels <ecki@debian.org> Sat, 28 Sep 2002 23:34:19 +0200
+
+cadaver (0.20.4-1) unstable; urgency=low
+
+ * new upstream version (Closes: Bug #156829)
+ * moved to main (from non-us)
+
+ -- Bernd Eckenfels <ecki@debian.org> Thu, 15 Aug 2002 23:50:37 +0200
+
+cadaver (0.18.0-2) unstable; urgency=low
+
+ * some changes to ensure a more stable build
+ (this restricts builds to my default build environment)
+ * use internal expat always and do note build depend on it
+ * use libxml2-dev in favor of old libxml-dev
+ * enforce internal libneon only (0.16)
+
+ -- Bernd Eckenfels <ecki@debian.org> Sat, 5 Jan 2002 03:19:48 +0100
+
+cadaver (0.18.0-1) unstable; urgency=low
+
+ * new upstream version
+ * recompile is supposed to fix Bug #110878, 110879
+ * new standards version 3.1.1 -> 3.5.6
+ * configure now checks for DEB_BUILD_OPTIONS (ugly!)
+ * removed INSTALLING to make lintian totally happy
+
+ -- Bernd Eckenfels <ecki@debian.org> Sun, 8 Apr 2001 00:02:43 +0200
+
+cadaver (0.17.0-4) unstable; urgency=low
+
+ * added build dependencies which fixes Bug #93233 (debmake)
+ * added some more cleaning
+
+ -- Bernd Eckenfels <ecki@debian.org> Sun, 8 Apr 2001 00:02:43 +0200
+
+cadaver (0.17.0-3) unstable; urgency=low
+
+ * added build dependencies which fixes Bug #92658 (libxmltok1-dev,
+ libexpat1-dev)
+
+ -- Bernd Eckenfels <ecki@debian.org> Thu, 5 Apr 2001 04:13:49 +0200
+
+cadaver (0.17.0-2) unstable; urgency=low
+
+ * changed build dependency on libssl-dev (#90389)
+
+ -- Bernd Eckenfels <ecki@debian.org> Mon, 2 Apr 2001 02:11:20 +0200
+
+cadaver (0.17.0-1) unstable; urgency=low
+
+ * new upstream version (fixes bug #86067)
+ * added --with-ssl --enable-warnings to configure
+ * added -isp to gencontrol to make lintian happy
+ * moved to non-US/main/web since it uses SSL
+
+ -- Bernd Eckenfels <ecki@debian.org> Thu, 1 Mar 2001 04:51:23 +0100
+
+cadaver (0.13.3-1) unstable; urgency=low
+
+ * new upstream version (fixed bug #61050)
+
+ -- Bernd Eckenfels <ecki@debian.org> Sat, 22 Jul 2000 06:25:02 +0200
+
+
+cadaver (0.9.0-1) unstable; urgency=low
+
+ * added some rm-s to the rules file
+ * the created Makefile does not support CFLAGS=.. removed from rules
+ * Initial release.
+
+ -- Bernd Eckenfels <ecki@lina.inka.de> Thu, 6 Jan 2000 09:39:32 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/control b/debian/control
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: cadaver
+Section: web
+Priority: optional
+Maintainer: Bernd Eckenfels <ecki@debian.org>
+Build-Depends: libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libssl-dev (>= 0.9.6f), debmake
+Standards-Version: 3.6.1
+
+Package: cadaver
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: command-line client for WebDAV server
+ Useful for WebDAV server testing and scripting. Works like command line FTP
+ clients.
+ .
+ Due to licensing issues (conflict between GPL and OpenSSL) this package
+ does not provide SSL (HTTPS) support, for now. GNU TLS Porters welcome.
+ .
+ Briefly: WebDAV stands for "Web-based Distributed Authoring and Versioning".
+ It is a set of extensions to the HTTP protocol which allows users to
+ collaboratively edit and manage files on remote web servers.
diff --git a/debian/copyright b/debian/copyright
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Bernd Eckenfels ecki@lina.inka.de on
+Thu, 6 Jan 2000 09:39:32 +0100.
+
+It was downloaded from http://www.webdav.org/cadaver/
+
+Copyright:
+
+cadaver is free software distributed under the GNU GPL. By
+joe@orton.demon.co.uk (Joe Orton).
+
+See /usr/share/common-licenses/GPL-2
diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex
--- /dev/null
+++ b/debian/manpage.1.ex
@@ -0,0 +1,41 @@
+.TH NAME SECTION
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+cadaver \- programs to do something
+.SH SYNOPSIS
+.B cadaver
+.I "[options] files ..."
+.br
+.B bar
+.I "[options] files ..."
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.BR cadaver ,
+and
+.B bar
+commands.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.B cadaver
+is a program that...
+.SH OPTIONS
+The programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options are included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH "SEE ALSO"
+The programs are documented fully by
+.IR "The Rise and Fall of a Fooish Bar" ,
+available via the Info system.
+.SH AUTHOR
+This manual page was written by Bernd Eckenfels <ecki@lina.inka.de>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/menu b/debian/menu
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,2 @@
+?package(cadaver):needs="text" section="Apps/Net"\
+ title="cadaver" command="/usr/bin/cadaver"
diff --git a/debian/postinst b/debian/postinst
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+# debstd here
diff --git a/debian/postrm b/debian/postrm
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+# debstd here
diff --git a/debian/rules b/debian/rules
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,57 @@
+#!/usr/bin/make -f
+# Copyright Bernd Eckenfels Thu, 6 Jan 2000 10:04:56 +0100. It's GPL
+# Made with the aid of debmake, by Christoph Lameter,
+# based on the sample debian/rules file for GNU hello by Ian Jackson.
+
+package=cadaver
+
+build:
+ $(checkdir)
+ -rm config.cache
+ # this configure will watch DEB_BUILD_OPTIONS for CFLAGS (-g)
+ ./configure --prefix=/usr --enable-warnings --with-included-neon --enable-netrc --without-ssl
+ $(MAKE)
+ touch build
+
+clean:
+ $(checkdir)
+ -rm -f build
+ -$(MAKE) clean
+ -(cd po ; rm -f Makefile.in POTFILES cat-id-tbl.c stamp-cat-id ; $(MAKE) distclean)
+ -(cd intl ; $(MAKE) distclean)
+ -(cd libneon ; $(MAKE) clean ; rm Makefile)
+ -rm -f `find . -name "*~"`
+ -rm -f config.h config.status config.log config.cache Makefile
+ -rm -rf debian/tmp debian/files* core debian/substvars
+
+binary-indep: checkroot build
+ $(checkdir)
+# There are no architecture-independent files to be uploaded
+# generated by this package. If there were any they would be
+# made here.
+
+binary-arch: checkroot build
+ $(checkdir)
+ -rm -rf debian/tmp
+ install -d debian/tmp
+ cd debian/tmp && install -d `cat ../dirs`
+ $(MAKE) install prefix=`pwd`/debian/tmp/usr
+# Must have debmake installed for this to work. Otherwise please copy
+# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
+ debstd ChangeLog INTEROP FAQ NEWS README TODO THANKS cadaver.lsm.in
+ dpkg-gencontrol -isp
+ chown -R root.root debian/tmp
+ chmod -R go=rX debian/tmp
+ dpkg --build debian/tmp ..
+
+define checkdir
+ test -f debian/rules
+endef
+
+binary: binary-indep binary-arch
+
+checkroot:
+ $(checkdir)
+ test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
diff --git a/lib/glob.c.diff b/lib/glob.c.diff
--- /dev/null
+++ b/lib/glob.c.diff
@@ -0,0 +1,22 @@
+--- cadaver-0.22.2.orig/lib/glob.c
++++ cadaver-0.22.2/lib/glob.c
+@@ -305,9 +305,6 @@
+ #include <glob.h>
+ \f
+ static
+-#if __GNUC__ - 0 >= 2
+-inline
+-#endif
+ const char *next_brace_sub __P ((const char *begin));
+ static int glob_in_dir __P ((const char *pattern, const char *directory,
+ int flags,
+@@ -320,9 +317,6 @@
+ /* Find the end of the sub-pattern in a brace expression. We define
+ this as an inline function if the compiler permits. */
+ static
+-#if __GNUC__ - 0 >= 2
+-inline
+-#endif
+ const char *
+ next_brace_sub (begin)
+ const char *begin;
diff --git a/libneon/ne_locks.c.diff b/libneon/ne_locks.c.diff
--- /dev/null
+++ b/libneon/ne_locks.c.diff
@@ -0,0 +1,11 @@
+--- cadaver-0.22.2.orig/libneon/ne_locks.c
++++ cadaver-0.22.2/libneon/ne_locks.c
+@@ -505,7 +505,7 @@
+ return end_element_common(lock, state, ctx->cdata->data);
+ }
+
+-static inline int can_accept(int parent, int id)
++static int can_accept(int parent, int id)
+ {
+ return (parent == NE_XML_STATEROOT && id == ELM_prop) ||
+ (parent == ELM_prop && id == ELM_lockdiscovery) ||
diff --git a/libneon/ne_request.c.diff b/libneon/ne_request.c.diff
--- /dev/null
@@ -0,0 +1,20 @@
+--- cadaver-0.22.2.orig/libneon/ne_request.c
++++ cadaver-0.22.2/libneon/ne_request.c
+@@ -176,7 +176,7 @@
+
+ /* Returns hash value for header 'name', converting it to lower-case
+ * in-place. */
+-static inline unsigned int hash_and_lower(char *name)
++static unsigned int hash_and_lower(char *name)
+ {
+ char *pnt;
+ unsigned int hash = 0;
+@@ -868,7 +868,7 @@
+ /* remove trailing EOL from 'buf', where strlen(buf) == *len. *len is
+ * adjusted in accordance with any changes made to the string to
+ * remain equal to strlen(buf). */
+-static inline void strip_eol(char *buf, ssize_t *len)
++static void strip_eol(char *buf, ssize_t *len)
+ {
+ char *pnt = &buf[*len-1];
+ while (pnt >= buf && (*pnt == '\r' || *pnt == '\n')) {
diff --git a/macros/neon.m4.diff b/macros/neon.m4.diff
--- /dev/null
+++ b/macros/neon.m4.diff
@@ -0,0 +1,11 @@
+--- cadaver-0.22.2.orig/macros/neon.m4
++++ cadaver-0.22.2/macros/neon.m4
+@@ -829,7 +829,7 @@
+ if test "$enable_warnings" = "yes"; then
+ case $GCC:`uname` in
+ yes:*)
+- CFLAGS="$CFLAGS -Wall -ansi-pedantic -Wmissing-declarations -Winline -Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align -Wbad-function-cast -Wimplicit-prototypes -Wformat-security"
++ CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Winline -Wshadow -Wreturn-type -Wsign-compare -Wundef -Wpointer-arith -Wcast-align -Wbad-function-cast -Wformat-security"
+ if test -z "$with_ssl" -o "$with_ssl" = "no"; then
+ # OpenSSL headers fail strict prototypes checks
+ CFLAGS="$CFLAGS -Wstrict-prototypes"