Subversion Repositories oidentd

Compare Revisions

Ignore whitespace Rev 27 → Rev 26

/trunk/debian/upstream/signing-key.asc
File deleted
/trunk/debian/changelog
1,34 → 1,3
oidentd (2.3.1-1) unstable; urgency=low
 
* Import changes from Ubuntu (Closes: #898378).
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2018 16:23:02 +0200
 
oidentd (2.3.1-0ubuntu1) devel; urgency=medium
 
* New upstream and new upstream release.
- Drop all patches, either applied upstream or not worthwhile.
* d/watch, d/upstream/signing-key.asc:
- Update to find new signed upstream releases.
* d/compat, d/control: Bump dh compat to 11.
* d/control:
- Change priority to optional.
- Set homepage to http://oidentd.janikrabe.com/
- Add B-D on bison, flex, libcap-ng-dev and libnetfilter-conntrack-dev.
* d/rules:
- Enable all hardening flags.
- Append --as-needed to LDFLAGS.
- Drop --with autotools-dev, dh 10 takes care of this.
- Drop override for configure, defaults are now sane.
* d/dirs: Drop.
* d/docs: Remove TODO and ChangeLog-1.x.
* d/oidentd.install, d/oidentd.conf, d/oidentd_masq.conf:
- Drop our config files in favor of upstream's.
* d/s/lintian-overrides: Update for tag rename.
* Update Standards-Version to 4.1.4.
 
-- Unit 193 <unit193@ubuntu.com> Tue, 19 Jun 2018 18:25:34 -0400
 
oidentd (2.0.8-10) unstable; urgency=low
 
* Add missing lsb-base dependency.
42,7 → 11,7
necessary since bug 533604 has been fixed.
* dont-touch-CFLAGS.patch: don't let --enable-debug mess with build
flags.
* Bump Standards-Version to 3.9.8.
* Bump Standards-Version to 3.9.8.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 10 Oct 2016 21:14:02 +0200
 
/trunk/debian/control
1,12 → 1,10
Source: oidentd
Section: net
Priority: optional
Build-Depends: debhelper (>= 11),
bison, flex, libcap-ng-dev,
libnetfilter-conntrack-dev
Priority: extra
Build-Depends: debhelper (>= 9), autotools-dev
Maintainer: Magnus Holmgren <holmgren@debian.org>
Standards-Version: 4.1.4
Homepage: https://oidentd.janikrabe.com/
Standards-Version: 3.9.8
Homepage: http://ojnk.sourceforge.net/
Vcs-Browser: http://svn.kibibyte.se/oidentd
Vcs-Svn: svn://svn.kibibyte.se/oidentd/trunk
 
21,7 → 19,7
An ident (rfc1413) daemon for IPv4 and IPv6.
.
Oidentd allows users, given the proper permission, to specify the
identd response that the server will output when a successful lookup
identd response that the server will output when a successful lookup
is completed. Oidentd also allows for pseudo-random strings
(either a prefix, such as "user," followed by a number between 0 and
99999, or 10 pseudo-random characters of the set 0-9A-Za-z) to be
/trunk/debian/patches/dont-touch-CFLAGS.patch
0,0 → 1,25
Description: Change the configure script so that --enable-debug doesn't modify $CFLAGS
The debug logging option is useful, but we don't want the build flags to be messed with.
 
--- a/configure
+++ b/configure
@@ -4533,7 +4533,7 @@ cat >>confdefs.h <<\_ACEOF
#define ENABLE_DEBUGGING 1
_ACEOF
- DEBUG_CFLAGS="-O0 -fvar-tracking -g3 -ggdb"
+# DEBUG_CFLAGS="-O0 -fvar-tracking -g3 -ggdb"
fi
enableval=""
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AC_ARG_ENABLE(debug,
[ --enable-debug Enable debugging])
if test "$enableval" = "yes"; then
AC_DEFINE(ENABLE_DEBUGGING, 1, [Define to enable debugging])
- DEBUG_CFLAGS="-O0 -fvar-tracking -g3 -ggdb"
+# DEBUG_CFLAGS="-O0 -fvar-tracking -g3 -ggdb"
fi
enableval=""
/trunk/debian/patches/series
0,0 → 1,4
bind-to-ipv6-too.patch
ftbfs-gcc5.patch
dont_mention_INSTALL.patch
dont-touch-CFLAGS.patch
/trunk/debian/patches/bind-to-ipv6-too.patch
0,0 → 1,19
Description: Patch to bind to ipv6 socket as well
Author: Fabian Knittel <fabian.knittel@avona.com>
Bug-Debian: https://bugs.debian.org/533604
 
--- oidentd-2.0.8//src/oidentd_inet_util.c 2006-05-22 02:31:19.000000000 +0200
+++ oidentd-2.0.8.new//src/oidentd_inet_util.c 2010-03-01 20:26:11.000000000 +0100
@@ -60,6 +60,12 @@
#ifdef WANT_IPV6
case AF_INET6:
SIN6(ai->ai_addr)->sin6_port = listen_port;
+
+ if (setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY, &one,
+ sizeof(one)) != 0) {
+ debug("setsockopt IPV6_V6ONLY: %s", strerror(errno));
+ return (-1);
+ }
break;
#endif
/trunk/debian/patches/dont_mention_INSTALL.patch
0,0 → 1,14
Description: Don't reference INSTALL, which isn't included in the package since it's mostly irrelevant to Debian users.
Bug-Debian: http://bugs.debian.org/253199
 
--- a/README
+++ b/README
@@ -7,8 +7,6 @@ oidentd has a flexible mechanism for spe
be granted permission to specify their own ident responses. Responses can be
specified according to host and port pairs.
-For details on how to install oidentd see the INSTALL file.
-
See the TODO file for things that need to be done.
For a complete list of features, consult the manual page or run
/trunk/debian/patches/ftbfs-gcc5.patch
0,0 → 1,25
Description: Fix a failure to build with gcc5.
Bug-Debian: http://bugs.debian.org/778035
 
--- a/src/oidentd_util.c 2015-07-03 05:56:24.000000000 -0400
+++ b/src/oidentd_util.c 2015-07-03 05:56:47.671378000 -0400
@@ -75,7 +75,7 @@
** PRNG functions on systems whose libraries provide them.)
*/
-inline int randval(int i) {
+extern __attribute__ ((gnu_inline)) int randval(int i) {
/* Per _Numerical Recipes in C_: */
return ((double) i * rand() / (RAND_MAX+1.0));
}
--- a/src/oidentd_util.h 2015-07-03 05:56:32.000000000 -0400
+++ b/src/oidentd_util.h 2015-07-03 05:56:53.835378000 -0400
@@ -58,7 +58,7 @@
int find_group(const char *temp_group, gid_t *gid);
int random_seed(void);
-inline int randval(int i);
+extern __attribute__ ((gnu_inline)) int randval(int i);
#ifndef HAVE_SNPRINTF
int snprintf(char *str, size_t n, char const *fmt, ...);
/trunk/debian/rules
1,7 → 1,7
#!/usr/bin/make -f
 
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh $@ --with autotools-dev
 
%:
dh $@
override_dh_auto_configure:
dh_auto_configure -- --enable-debug --enable-nat
/trunk/debian/compat
1,0 → 0,0
11
9
/trunk/debian/docs
1,3 → 1,5
AUTHORS
TODO
README
NEWS
ChangeLog-1.x
/trunk/debian/source/lintian-overrides
1,0 → 0,0
oidentd source: license-problem-gfdl-non-official-text
oidentd source: license-problem-gfdl-invariants debian/copyright invariant part is: with the invariant sections being no invariant sections, with the front-cover texts being no front-cover texts, and with the back-cover texts being no back-cover texts
oidentd source: license-problem-gfdl-invariants doc/oidentd.8 invariant part is: with the invariant sections being no invariant sections, with the front-cover texts being no front-cover texts, and with the back-cover texts being no back-cover texts
oidentd source: license-problem-gfdl-invariants doc/oidentd.conf.5 invariant part is: with the invariant sections being no invariant sections, with the front-cover texts being no front-cover texts, and with the back-cover texts being no back-cover texts
oidentd source: license-problem-gfdl-invariants doc/oidentd_masq.conf.5 invariant part is: with the invariant sections being no invariant sections, with the front-cover texts being no front-cover texts, and with the back-cover texts being no back-cover texts
/trunk/debian/dirs
0,0 → 1,2
etc/default
usr/sbin
/trunk/debian/oidentd.conf
0,0 → 1,22
# Configuration for oidentd
# see oidentd.conf(5)
#
default {
default {
deny spoof
deny spoof_all
deny spoof_privport
allow random
allow random_numeric
allow numeric
deny hide
}
}
 
# you may want to hide root connections
#user "root" {
# default {
# force reply "UNKNOWN"
# }
#}
 
/trunk/debian/oidentd.install
0,0 → 1,2
debian/oidentd.conf etc/
debian/oidentd_masq.conf etc/
/trunk/debian/oidentd_masq.conf
0,0 → 1,11
# oident masquarded connections configuration
 
# use this file if your host is masquarading connections for several
# hosts and you want to return a reply based on the hostname of
# the originating machine
# by default, such requests are forwarded to the real host.
# you can disable forwarding by removing "-f" from OIDENT_OPTIONS
# in /etc/default/oidentd
 
# add hosts in the following format, see oidentd_masq.conf(5) for details:
# <ip or host>[/mask] <username> <os>
/trunk/debian/watch
1,3 → 1,3
version=3
opts=pgpsigurlmangle=s/$/.asc/ \
https://github.com/janikrabe/oidentd/releases .*/oidentd-([\.\d]+)\.tar\.(?:xz|bz2|gz)
http://qa.debian.org/watch/sf.php/ojnk/ \
(?:|.*/)oidentd(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)