Browse Source

Packaging cleanup

* Refresh patch queue
* Add missing install dependency on lsb-base
* Declare complicance with policy 3.9.8
* Bump to debhelper compat level 10
* Reformat debian/copyright
Christoph Biedl 5 years ago
parent
commit
ca0d7d1556
5 changed files with 49 additions and 45 deletions
  1. 1 1
      debian/compat
  2. 3 4
      debian/control
  3. 43 36
      debian/copyright
  4. 1 3
      debian/patches/60-change-chroot-dir.patch
  5. 1 1
      debian/patches/series

+ 1 - 1
debian/compat

@@ -1 +1 @@
-9
+10

+ 3 - 4
debian/control

@@ -1,10 +1,8 @@
 Source: softflowd
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: http://code.google.com/p/softflowd/
-Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9.20~),
-    autoconf,
-    autotools-dev,
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 10~),
     libpcap0.8-dev,
 Priority: extra
 Section: net
@@ -12,6 +10,7 @@ Section: net
 Package: softflowd
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
+    lsb-base,
 Description: Flow-based network traffic analyser
  Softflowd is a flow-based network traffic anaylser capable of Cisco
  Netflow data export. Softflowd semi-statefully tracks traffic

+ 43 - 36
debian/copyright

@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: softflowd
 Upstream-Contact: Damien Miller <djm@mindrot.org>
 Source: http://code.google.com/p/softflowd
@@ -7,33 +7,38 @@ Files: *
 Copyright: 2002-2006 Damien Miller <djm@mindrot.org>
 License: like-BSD-2-clause
 
-Files: closefrom.c
+Files:
+ closefrom.c
 Copyright: 2004 Todd C. Miller <Todd.Miller@courtesan.com>
 License: other
 
-Files: convtime.c
+Files:
+ convtime.c
 Copyright: 2001 Kevin Steves
 License: like-BSD-2-clause
 
-Files: daemon.c
+Files:
+ daemon.c
 Copyright: 1990, 1993 The Regents of the University of California.
 License: BSD-3-Clause
 
-Files: strlcat.c strlcpy.c
+Files:
+ strlcat.c
+ strlcpy.c
 Copyright: 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 License: other
 
-Files: sys-tree.h
+Files:
+ sys-tree.h
 Copyright: 2002 Niels Provos <provos@citi.umich.edu>
 License: like-BSD-2-clause
 
-Files: debian/*
+Files:
+ debian/*
 Copyright: 2007-2012 Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 License: GPL-2.0+
 
-Comment: This is the BSD-2-clause license with "THE COPYRIGHT HOLDER OR
- CONTRIBUTORS" replaced by "THE AUTHOR".
-License: like-BSD-2-clause
+License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -42,17 +47,22 @@ License: like-BSD-2-clause
  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. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: other
  Permission to use, copy, modify, and distribute this software for any
@@ -67,7 +77,7 @@ License: other
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-License: BSD-3-Clause
+License: like-BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -76,22 +86,19 @@ License: BSD-3-Clause
  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. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Comment: This is the BSD-2-clause license with "THE COPYRIGHT HOLDER OR
+ CONTRIBUTORS" replaced by "THE AUTHOR".
 
 License: GPL-2.0+
  This package is free software; you can redistribute it and/or modify

+ 1 - 3
debian/patches/60-change-chroot-dir.patch

@@ -1,9 +1,7 @@
-From: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
 Subject: Change PRIVDROP_CHROOT_DIR to a real location
+Author: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
 Forwarded: not-needed
 
-diff --git a/softflowd.h b/softflowd.h
-index b000214..82a5d9e 100644
 --- a/softflowd.h
 +++ b/softflowd.h
 @@ -36,7 +36,7 @@

+ 1 - 1
debian/patches/series

@@ -1 +1 @@
-60-change-chroot-dir.patch
+change-chroot-dir.patch