Development March 2017

development@lists.ipfire.org

7 participants
42 discussions

[PATCH] bind: Rework package and update to 9.9.9-P6
by Stefan Schantl 23 Apr '17

23 Apr '17

This commit rapidely slims down the bind package. It now only provides the libraries and development files, which are needed to build the isc-dhcp server and in a subpackage some very handy utils like dig, host and some more. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- bind/bind.nm | 142 ++++----- bind/named.tmpfiles | 1 - bind/patches/bind-9.5-PIE.patch | 27 -- bind/patches/bind-9.5-parallel-build.patch | 14 - bind/patches/bind-9.9-libidn.patch | 326 --------------------- ...-9.7-exportlib.patch => bind97-exportlib.patch} | 0 bind/patches/bind99-dont-build-bin.patch | 13 + bind/trusted-key.key | 1 - 8 files changed, 69 insertions(+), 455 deletions(-) delete mode 100644 bind/named.tmpfiles delete mode 100644 bind/patches/bind-9.5-PIE.patch delete mode 100644 bind/patches/bind-9.5-parallel-build.patch delete mode 100644 bind/patches/bind-9.9-libidn.patch rename bind/patches/{bind-9.7-exportlib.patch => bind97-exportlib.patch} (100%) create mode 100644 bind/patches/bind99-dont-build-bin.patch delete mode 100644 bind/trusted-key.key diff --git a/bind/bind.nm b/bind/bind.nm index 7b6344f..4775c14 100644 --- a/bind/bind.nm +++ b/bind/bind.nm @@ -4,8 +4,8 @@ ############################################################################### name = bind -version = 9.9.6-P1 -release = 2 +version = 9.9.9-P6 +release = 1 groups = Networking/Tools url = http://www.isc.org/products/BIND/ @@ -19,14 +19,10 @@ end source_dl = ftp://ftp.isc.org/isc/bind/%{version}/ -sources += \ - %{name}-config-12.tar.bz2 - build requires autoconf automake - chrpath libcap-devel libidn-devel libtool @@ -43,116 +39,88 @@ build --disable-static \ --disable-openssl-version-check \ --enable-exportlib \ - --with-export-libdir=/%{lib}/ \ - --with-export-includedir=/usr/include/ \ - --includedir=/usr/include/bind9/ \ - --with-pkcs11=%{libdir}/pkcs11/PKCS11_API.so \ + --with-export-libdir=%{libdir}/ \ + --with-export-includedir=%{includedir} \ + --includedir=%{includedir}/bind9/ \ --with-gssapi \ --enable-rrl \ --disable-isc-spnego - prepare - cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}.tar.gz - + prepare_cmds # Create m4 directory. cd %{DIR_APP} && mkdir -pv m4 - # Apply all patches. - %{MACRO_PATCHES} - # Branding. sed -i -e 's/RELEASEVER=$.*$/RELEASEVER=\1-%{DISTRO_NAME}-%{version}-%{release}/' version # Regenerate build environment - libtoolize -c -f - aclocal -I m4 --force - autoconf -f + autoreconf -vfi - # Create user and group for /run directory. - %{create_user} end - install - # Create directory layout. - mkdir -pv %{BUILDROOT}%{libdir}/bind - mkdir -pv %{BUILDROOT}/var/named/{slaves,data,dynamic} - mkdir -pv %{BUILDROOT}/usr/share/man/{man1,man5,man8} - mkdir -pv %{BUILDROOT}/run/named - mkdir -pv %{BUILDROOT}/var/log - - # Create named chroot environment. - mkdir -pv %{BUILDROOT}/var/named/chroot/{dev,etc,var} - mkdir -pv %{BUILDROOT}/var/named/chroot/var/{log,named,run/named,tmp} - mkdir -pv %{BUILDROOT}/var/named/chroot/etc/{pki/dnssec-keys,named} - mkdir -pv %{BUILDROOT}/var/named/chroot/usr/lib/bind - mkdir -pv %{BUILDROOT}/var/named/chroot/dev/null - mkdir -pv %{BUILDROOT}/var/named/chroot/dev/random - mkdir -pv %{BUILDROOT}/var/named/chroot/dev/zero - mkdir -pv %{BUILDROOT}/var/named/chroot/etc/localtime + build_cmds + # Build some typical system tools (dig, host, nslookup) + make -C bin/dig -j %{PARALLELISMFLAGS} - touch %{BUILDROOT}/var/named/chroot/etc/named.conf - - # Run make install - make DESTDIR=%{BUILDROOT} install + # Build nsupdate + make -C bin/nsupdate -j %{PARALLELISMFLAGS} + end - # Remove RPATH from libraries. - chrpath --delete %{BUILDROOT}/lib*/*export*.so.* + install_cmds + # Install typical system tools + make -C bin/dig install DESTDIR=%{BUILDROOT} - # Remove unwanted files - rm -rvf %{BUILDROOT}/etc/bind.keys + # Install nsupdate + make -C bin/nsupdate install DESTDIR=%{BUILDROOT} - # Create ghost config files - touch %{BUILDROOT}/var/log/named.log + # Install isc/errno2result.h header + install -m 644 lib/isc/unix/errno2result.h %{BUILDROOT}%{includedir}/isc - # Configuration files - tar -C %{BUILDROOT} -xaf %{DIR_DL}/bind-config-12.tar.bz2 - touch %{BUILDROOT}/etc/rndc.key - touch %{BUILDROOT}/etc/rndc.conf + # Remove development libraries and headers except *-export ones + rm -rvf %{BUILDROOT}%{libdir}/libbind9.so + rm -rvf %{BUILDROOT}%{libdir}/libdns.so + rm -rvf %{BUILDROOT}%{libdir}/libisccc.so + rm -rvf %{BUILDROOT}%{libdir}/libisccfg.so + rm -rvf %{BUILDROOT}%{libdir}/libisc.so + rm -rvf %{BUILDROOT}%{libdir}/liblwres.so + rm -rvf %{BUILDROOT}%{includedir}/bind9 - mkdir %{BUILDROOT}/etc/named - install -m 644 bind.keys %{BUILDROOT}/etc/named.iscdlv.key - install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key + # Remove unwanted files + rm -rvf %{BUILDROOT}/etc + rm -rvf %{BUILDROOT}/var - # Recreate symlinks for export libraries - rm -rf %{BUILDROOT}/%{lib}/lib*-export.so + # Remove unneeded tools + rm -rvf %{BUILDROOT}%{bindir}/isc-config.sh + rm -rvf %{BUILDROOT}%{bindir}/bind9-config - ln -svf ../../%{lib}/libdns-export.so.104 %{BUILDROOT}%{libdir}/libdns-export.so - ln -svf ../../%{lib}/libirs-export.so.91 %{BUILDROOT}%{libdir}/libirs-export.so - ln -svf ../../%{lib}/libisccfg-export.so.90 %{BUILDROOT}%{libdir}/libisccfg-export.so - ln -svf ../../%{lib}/libisc-export.so.95 %{BUILDROOT}%{libdir}/libisc-export.so + # Remove manpages for the unneeded tools + rm -rvf %{BUILDROOT}%{mandir}/man1/isc-config.sh.1 + rm -rvf %{BUILDROOT}%{mandir}/man1/bind9-config.1 - # Create /run/named. - mkdir -pv %{BUILDROOT}/run/named - chown -Rv named.named %{BUILDROOT}/run/named/ + # Remove documentation for liblwres and tools + rm -rvf %{BUILDROOT}%{mandir}/man3 end end -create_user - getent group named >/dev/null || /usr/sbin/groupadd -r named - getent passwd named >/dev/null || /usr/sbin/useradd -r -g named \ - -d /var/named -c "User for bind DNS server" -s /sbin/nologin named -end - packages package %{name} + # The bind package is just an umbrella package for the utils + # and libs package. requires - bind-utils - bind-chroot - end - - prerequires += shadow-utils - - script prein - %{create_user} + %{name}-libs = %{thisver} + %{name}-utils = %{thisver} + %{name}-utils-libs = %{thisver} end - - # XXX Add systemd scriptlet if a service file becomes available end package %{name}-utils summary = Utilities for querying bind DNS name server. description = %{summary} + requires + %{name}-utils-libs = %{thisver} + end + files /usr/bin/dig /usr/bin/host @@ -165,17 +133,19 @@ packages end end - package %{name}-chroot - summary = Chroot environment for bind DNS servers. - description = %{summary} + package %{name}-utils-libs + template LIBS - files - /var/named/chroot - end + summary = Required libraries for the tools in the bind-utils package. + description = %{summary} end package %{name}-libs template LIBS + + files + %{libdir}/*export.so.* + end end package %{name}-devel diff --git a/bind/named.tmpfiles b/bind/named.tmpfiles deleted file mode 100644 index 640a656..0000000 --- a/bind/named.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/named 0755 named named - diff --git a/bind/patches/bind-9.5-PIE.patch b/bind/patches/bind-9.5-PIE.patch deleted file mode 100644 index a525b9b..0000000 --- a/bind/patches/bind-9.5-PIE.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- bind-9.5.0b2/bin/named/Makefile.in.pie 2008-02-11 17:21:47.000000000 +0100 -+++ bind-9.5.0b2/bin/named/Makefile.in 2008-02-11 17:22:10.000000000 +0100 -@@ -100,8 +100,12 @@ HTMLPAGES = named.html lwresd.html named - - MANOBJS = ${MANPAGES} ${HTMLPAGES} - -+EXT_CFLAGS = -fpie -+ - @BIND9_MAKE_RULES@ - -+LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack -+ - main.@O@: main.c - ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ - -DVERSION=\"${VERSION}\" \ -diff -up bind-9.5.0b2/bin/named/unix/Makefile.in.pie bind-9.5.0b2/bin/named/unix/Makefile.in ---- bind-9.5.0b2/bin/named/unix/Makefile.in.pie 2008-02-11 17:22:21.000000000 +0100 -+++ bind-9.5.0b2/bin/named/unix/Makefile.in 2008-02-11 17:23:00.000000000 +0100 -@@ -19,6 +19,8 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - -+EXT_CFLAGS = -fpie -+ - @BIND9_MAKE_INCLUDES@ - - CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ diff --git a/bind/patches/bind-9.5-parallel-build.patch b/bind/patches/bind-9.5-parallel-build.patch deleted file mode 100644 index 53e34ca..0000000 --- a/bind/patches/bind-9.5-parallel-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up bind-9.5.0b1/lib/dns/Makefile.in.parallel bind-9.5.0b1/lib/dns/Makefile.in ---- bind-9.5.0b1/lib/dns/Makefile.in.parallel 2008-01-17 18:27:38.000000000 +0100 -+++ bind-9.5.0b1/lib/dns/Makefile.in 2008-01-17 18:27:45.000000000 +0100 -@@ -19,10 +19,6 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --# Attempt to disable parallel processing. --.NOTPARALLEL: --.NO_PARALLEL: -- - @BIND9_VERSION@ - - @LIBDNS_API@ diff --git a/bind/patches/bind-9.9-libidn.patch b/bind/patches/bind-9.9-libidn.patch deleted file mode 100644 index fca8665..0000000 --- a/bind/patches/bind-9.9-libidn.patch +++ /dev/null @@ -1,326 +0,0 @@ -From 19809fe6154ea0471a2c4fa3bd66787facf7704a Mon Sep 17 00:00:00 2001 -From: Tomas Hozza <thozza(a)redhat.com> -Date: Mon, 26 May 2014 15:25:34 +0200 -Subject: [PATCH] Use libidn instead of bundled idnkit - -Signed-off-by: Tomas Hozza <thozza(a)redhat.com> ---- - bin/dig/Makefile.in | 6 +- - bin/dig/dig.docbook | 4 +- - bin/dig/dighost.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++---- - 3 files changed, 162 insertions(+), 16 deletions(-) - -diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in -index 5bc4db0..3864e06 100644 ---- a/bin/dig/Makefile.in -+++ b/bin/dig/Makefile.in -@@ -48,10 +48,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} \ - ${LWRESDEPLIBS} - - LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ -- ${ISCLIBS} @IDNLIBS@ @LIBS@ -+ ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn - - NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ -- ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -+ ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn - - SUBDIRS = - -@@ -69,6 +69,8 @@ HTMLPAGES = dig.html host.html nslookup.html - - MANOBJS = ${MANPAGES} ${HTMLPAGES} - -+EXT_CFLAGS = -DWITH_LIBIDN -+ - @BIND9_MAKE_RULES@ - - dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} -diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook -index 7a01ec0..c3a7976 100644 ---- a/bin/dig/dig.docbook -+++ b/bin/dig/dig.docbook -@@ -970,8 +970,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr - <command>dig</command> appropriately converts character encoding of - domain name before sending a request to DNS server or displaying a - reply from the server. -- If you'd like to turn off the IDN support for some reason, defines -- the <envar>IDN_DISABLE</envar> environment variable. -+ If you'd like to turn off the IDN support for some reason, define -+ the <envar>CHARSET=ASCII</envar> environment variable. - The IDN support is disabled if the variable is set when - <command>dig</command> runs. - </para> -diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index 56d763c..5a40051 100644 ---- a/bin/dig/dighost.c -+++ b/bin/dig/dighost.c -@@ -44,6 +44,11 @@ - #include <idn/api.h> - #endif - -+#ifdef WITH_LIBIDN -+#include <stringprep.h> -+#include <idna.h> -+#endif -+ - #include <dns/byaddr.h> - #ifdef DIG_SIGCHASE - #include <dns/callbacks.h> -@@ -158,6 +163,14 @@ static void idn_check_result(idn_result_t r, const char *msg); - int idnoptions = 0; - #endif - -+#ifdef WITH_LIBIDN -+static isc_result_t libidn_locale_to_utf8 (const char* from, char *to); -+static isc_result_t libidn_utf8_to_ascii (const char* from, char *to); -+static isc_result_t output_filter (isc_buffer_t *buffer, -+ unsigned int used_org, -+ isc_boolean_t absolute); -+#endif -+ - isc_socket_t *keep = NULL; - isc_sockaddr_t keepaddr; - -@@ -1210,6 +1223,9 @@ setup_system(void) { - dig_searchlist_t *domain = NULL; - lwres_result_t lwresult; - unsigned int lwresflags; -+#ifdef WITH_LIBIDN -+ isc_result_t result; -+#endif - - debug("setup_system()"); - -@@ -1268,8 +1284,15 @@ setup_system(void) { - - #ifdef WITH_IDN - initialize_idn(); -+ -+#endif -+#ifdef WITH_LIBIDN -+ result = dns_name_settotextfilter(output_filter); -+ check_result(result, "dns_name_settotextfilter"); -+#ifdef HAVE_SETLOCALE -+ setlocale (LC_ALL, ""); -+#endif - #endif -- - if (keyfile[0] != 0) - setup_file_key(); - else if (keysecret[0] != 0) -@@ -2028,12 +2051,14 @@ setup_lookup(dig_lookup_t *lookup) { - idn_result_t mr; - char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME]; - #endif -+#ifdef WITH_LIBIDN -+ char utf8_str[MXNAME], utf8_name[MXNAME], ascii_name[MXNAME]; -+#endif - --#ifdef WITH_IDN -+#if defined (WITH_IDN) || defined (WITH_LIBIDN) - result = dns_name_settotextfilter(output_filter); - check_result(result, "dns_name_settotextfilter"); - #endif -- - REQUIRE(lookup != NULL); - INSIST(!free_now); - -@@ -2070,6 +2095,14 @@ setup_lookup(dig_lookup_t *lookup) { - mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname, - utf8_textname, sizeof(utf8_textname)); - idn_check_result(mr, "convert textname to UTF-8"); -+#elif defined (WITH_LIBIDN) -+ result = libidn_locale_to_utf8 (lookup->textname, utf8_str); -+ check_result (result, "convert textname to UTF-8"); -+ len = strlen (utf8_str); -+ if (len < MXNAME) -+ (void) strcpy (utf8_name, utf8_str); -+ else -+ fatal ("Too long name"); - #endif - - /* -@@ -2082,15 +2115,11 @@ setup_lookup(dig_lookup_t *lookup) { - if (lookup->new_search) { - #ifdef WITH_IDN - if ((count_dots(utf8_textname) >= ndots) || !usesearch) { -- lookup->origin = NULL; /* Force abs lookup */ -- lookup->done_as_is = ISC_TRUE; -- lookup->need_search = usesearch; -- } else if (lookup->origin == NULL && usesearch) { -- lookup->origin = ISC_LIST_HEAD(search_list); -- lookup->need_search = ISC_FALSE; -- } -+#elif defined (WITH_LIBIDN) -+ if ((count_dots(utf8_name) >= ndots) || !usesearch) { - #else - if ((count_dots(lookup->textname) >= ndots) || !usesearch) { -+#endif - lookup->origin = NULL; /* Force abs lookup */ - lookup->done_as_is = ISC_TRUE; - lookup->need_search = usesearch; -@@ -2098,7 +2127,6 @@ setup_lookup(dig_lookup_t *lookup) { - lookup->origin = ISC_LIST_HEAD(search_list); - lookup->need_search = ISC_FALSE; - } --#endif - } - - #ifdef WITH_IDN -@@ -2115,6 +2143,20 @@ setup_lookup(dig_lookup_t *lookup) { - IDN_IDNCONV | IDN_LENCHECK, utf8_textname, - idn_textname, sizeof(idn_textname)); - idn_check_result(mr, "convert UTF-8 textname to IDN encoding"); -+#elif defined (WITH_LIBIDN) -+ if (lookup->origin != NULL) { -+ result = libidn_locale_to_utf8 (lookup->origin->origin, utf8_str); -+ check_result (result, "convert origin to UTF-8"); -+ if (len > 0 && utf8_name[len - 1] != '.') { -+ utf8_name[len++] = '.'; -+ if (len + strlen (utf8_str) < MXNAME) -+ (void) strcpy (utf8_name + len, utf8_str); -+ else -+ fatal ("Too long name + origin"); -+ } -+ } -+ -+ result = libidn_utf8_to_ascii (utf8_name, ascii_name); - #else - if (lookup->origin != NULL) { - debug("trying origin %s", lookup->origin->origin); -@@ -2170,6 +2212,13 @@ setup_lookup(dig_lookup_t *lookup) { - result = dns_name_fromtext(lookup->name, &b, - dns_rootname, 0, - &lookup->namebuf); -+#elif defined (WITH_LIBIDN) -+ len = strlen (ascii_name); -+ isc_buffer_init(&b, ascii_name, len); -+ isc_buffer_add(&b, len); -+ result = dns_name_fromtext(lookup->name, &b, -+ dns_rootname, 0, -+ &lookup->namebuf); - #else - len = strlen(lookup->textname); - isc_buffer_init(&b, lookup->textname, len); -@@ -3788,7 +3837,7 @@ destroy_libs(void) { - void * ptr; - dig_message_t *chase_msg; - #endif --#ifdef WITH_IDN -+#if defined (WITH_IDN) || defined (WITH_LIBIDN) - isc_result_t result; - #endif - -@@ -3829,6 +3878,10 @@ destroy_libs(void) { - result = dns_name_settotextfilter(NULL); - check_result(result, "dns_name_settotextfilter"); - #endif -+#ifdef WITH_LIBIDN -+ result = dns_name_settotextfilter (NULL); -+ check_result(result, "clearing dns_name_settotextfilter"); -+#endif - dns_name_destroy(); - - if (commctx != NULL) { -@@ -4008,6 +4061,97 @@ idn_check_result(idn_result_t r, const char *msg) { - } - } - #endif /* WITH_IDN */ -+#ifdef WITH_LIBIDN -+static isc_result_t -+libidn_locale_to_utf8 (const char *from, char *to) { -+ char *utf8_str; -+ -+ debug ("libidn_locale_to_utf8"); -+ utf8_str = stringprep_locale_to_utf8 (from); -+ if (utf8_str != NULL) { -+ (void) strcpy (to, utf8_str); -+ free (utf8_str); -+ return ISC_R_SUCCESS; -+ } -+ -+ debug ("libidn_locale_to_utf8: failure"); -+ return ISC_R_FAILURE; -+} -+static isc_result_t -+libidn_utf8_to_ascii (const char *from, char *to) { -+ char *ascii; -+ int iresult; -+ -+ debug ("libidn_utf8_to_ascii"); -+ iresult = idna_to_ascii_8z (from, &ascii, 0); -+ if (iresult != IDNA_SUCCESS) { -+ debug ("idna_to_ascii_8z: %s", idna_strerror (iresult)); -+ return ISC_R_FAILURE; -+ } -+ -+ (void) strcpy (to, ascii); -+ free (ascii); -+ return ISC_R_SUCCESS; -+} -+ -+static isc_result_t -+output_filter (isc_buffer_t *buffer, unsigned int used_org, -+ isc_boolean_t absolute) { -+ -+ char tmp1[MXNAME], *tmp2; -+ size_t fromlen, tolen; -+ isc_boolean_t end_with_dot; -+ int iresult; -+ -+ debug ("output_filter"); -+ -+ fromlen = isc_buffer_usedlength (buffer) - used_org; -+ if (fromlen >= MXNAME) -+ return ISC_R_SUCCESS; -+ memcpy (tmp1, (char *) isc_buffer_base (buffer) + used_org, fromlen); -+ end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE; -+ if (absolute && !end_with_dot) { -+ fromlen++; -+ if (fromlen >= MXNAME) -+ return ISC_R_SUCCESS; -+ tmp1[fromlen - 1] = '.'; -+ } -+ tmp1[fromlen] = '\0'; -+ -+ iresult = idna_to_unicode_8z8z (tmp1, &tmp2, 0); -+ if (iresult != IDNA_SUCCESS) { -+ debug ("output_filter: %s", idna_strerror (iresult)); -+ return ISC_R_SUCCESS; -+ } -+ -+ (void) strcpy (tmp1, tmp2); -+ free (tmp2); -+ -+ tmp2 = stringprep_utf8_to_locale (tmp1); -+ if (tmp2 == NULL) { -+ debug ("output_filter: stringprep_utf8_to_locale failed"); -+ return ISC_R_SUCCESS; -+ } -+ -+ (void) strcpy (tmp1, tmp2); -+ free (tmp2); -+ -+ tolen = strlen (tmp1); -+ if (absolute && !end_with_dot && tmp1[tolen - 1] == '.') -+ tolen--; -+ -+ if (isc_buffer_length (buffer) < used_org + tolen) -+ return ISC_R_NOSPACE; -+ -+ debug ("%s", tmp1); -+ -+ isc_buffer_subtract (buffer, isc_buffer_usedlength (buffer) - used_org); -+ memcpy (isc_buffer_used (buffer), tmp1, tolen); -+ isc_buffer_add (buffer, tolen); -+ -+ return ISC_R_SUCCESS; -+} -+#endif /* WITH_LIBIDN*/ - - #ifdef DIG_SIGCHASE - void --- -1.9.0 - diff --git a/bind/patches/bind-9.7-exportlib.patch b/bind/patches/bind97-exportlib.patch similarity index 100% rename from bind/patches/bind-9.7-exportlib.patch rename to bind/patches/bind97-exportlib.patch diff --git a/bind/patches/bind99-dont-build-bin.patch b/bind/patches/bind99-dont-build-bin.patch new file mode 100644 index 0000000..ae50372 --- /dev/null +++ b/bind/patches/bind99-dont-build-bin.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 4f7f5a6..d59b9b1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@ + + VERSION=@BIND9_VERSION@ + +-SUBDIRS = make unit lib bin doc @LIBEXPORT@ ++SUBDIRS = make lib doc @LIBEXPORT@ + TARGETS = + + MANPAGES = isc-config.sh.1 diff --git a/bind/trusted-key.key b/bind/trusted-key.key deleted file mode 100644 index ea07836..0000000 --- a/bind/trusted-key.key +++ /dev/null @@ -1 +0,0 @@ -. 3600 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= -- 2.9.3

2 2

[PATCH] git: update to 2.12.1
by Marcel Lorenz 14 Apr '17

14 Apr '17

https://github.com/git/git/blob/master/Documentation/RelNotes/2.12.0.txt https://github.com/git/git/blob/master/Documentation/RelNotes/2.12.1.txt Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/packages/git | 35 +++++++++++++++++++---------------- lfs/git | 11 ++++++----- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index ea31b20..8d26912 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -10,22 +10,22 @@ usr/lib/perl5/site_perl/5.12.3/Error.pm usr/lib/perl5/site_perl/5.12.3/Git.pm usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm -#usr/lib/perl5/site_perl/5.12.3/Git/SVN -usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm -usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist +usr/lib/perl5/site_perl/5.12.3/Git/SVN +#usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm +#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm +#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Git +#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Git/.packlist #usr/libexec/git-core -#usr/libexec/git-core/git +usr/libexec/git-core/git usr/libexec/git-core/git-add usr/libexec/git-core/git-add--interactive usr/libexec/git-core/git-am @@ -138,7 +138,6 @@ usr/libexec/git-core/git-rebase--interactive usr/libexec/git-core/git-rebase--merge usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog -usr/libexec/git-core/git-relink usr/libexec/git-core/git-remote usr/libexec/git-core/git-remote-ext usr/libexec/git-core/git-remote-fd @@ -201,6 +200,7 @@ usr/libexec/git-core/mergetools/diffmerge usr/libexec/git-core/mergetools/diffuse usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge +usr/libexec/git-core/mergetools/examdiff usr/libexec/git-core/mergetools/gvimdiff usr/libexec/git-core/mergetools/gvimdiff2 usr/libexec/git-core/mergetools/gvimdiff3 @@ -228,6 +228,7 @@ usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample usr/share/git-core/templates/hooks/pre-push.sample usr/share/git-core/templates/hooks/pre-rebase.sample +usr/share/git-core/templates/hooks/pre-receive.sample usr/share/git-core/templates/hooks/prepare-commit-msg.sample usr/share/git-core/templates/hooks/update.sample #usr/share/git-core/templates/info @@ -270,6 +271,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/msgs/ja.msg #usr/share/git-gui/lib/msgs/nb.msg #usr/share/git-gui/lib/msgs/pt_br.msg +#usr/share/git-gui/lib/msgs/pt_pt.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg #usr/share/git-gui/lib/msgs/vi.msg @@ -302,6 +304,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/it.msg #usr/share/gitk/lib/msgs/ja.msg #usr/share/gitk/lib/msgs/pt_br.msg +#usr/share/gitk/lib/msgs/pt_pt.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg #usr/share/gitk/lib/msgs/vi.msg diff --git a/lfs/git b/lfs/git index 564bc09..9b55b20 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@ include Config -VER = 2.7.4 +VER = 2.12.1 THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 13 +PAK_VER = 14 DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b0219fcb6d73104361f4fbdba3741d00 +$(DL_FILE)_MD5 = a05c614c80ecd41e50699f1562e1130c install : $(TARGET) @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && autoconf cd $(DIR_APP) && ./configure \ --with-gitconfig=/etc/gitconfig \ --prefix=/usr \ -- 2.9.3

2 2

[PATCH] linux-atm: update to 2.5.2
by Marcel Lorenz 06 Apr '17

06 Apr '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/linux-atm | 47 ++++--- lfs/linux-atm | 8 +- src/patches/linux-atm-2.4.1-arpd_includes.patch | 42 ------- src/patches/linux-atm-2.4.1-gcc-4.patch | 161 ------------------------ 4 files changed, 31 insertions(+), 227 deletions(-) delete mode 100644 src/patches/linux-atm-2.4.1-arpd_includes.patch delete mode 100644 src/patches/linux-atm-2.4.1-gcc-4.patch diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm index 7cc8323..bcab145 100644 --- a/config/rootfiles/common/linux-atm +++ b/config/rootfiles/common/linux-atm @@ -1,11 +1,17 @@ #etc/atmsigd.conf #etc/hosts.atm +#lib/firmware/pca200e.bin +#lib/firmware/pca200e_ecd.bin2 +#lib/firmware/sba200e_ecd.bin2 #usr/bin/aread #usr/bin/atmdiag #usr/bin/atmdump +#usr/bin/atmswitch #usr/bin/awrite #usr/bin/saaldump #usr/bin/sonetdiag +#usr/bin/svc_recv +#usr/bin/svc_send #usr/bin/ttcp_atm #usr/include/atm.h #usr/include/atmarp.h @@ -17,37 +23,40 @@ usr/lib/libatm.so usr/lib/libatm.so.1 usr/lib/libatm.so.1.0.0 -#usr/man/man4 -#usr/man/man4/atmsigd.conf.4 -#usr/man/man7/qos.7 -#usr/man/man7/sap.7 -#usr/man/man8 -#usr/man/man8/atmaddr.8 -#usr/man/man8/atmarp.8 -#usr/man/man8/atmarpd.8 -#usr/man/man8/atmdiag.8 -#usr/man/man8/atmdump.8 -#usr/man/man8/atmloop.8 -#usr/man/man8/atmsigd.8 -#usr/man/man8/atmtcp.8 -#usr/man/man8/bus.8 -#usr/man/man8/esi.8 -#usr/man/man8/lecs.8 -#usr/man/man8/les.8 -#usr/man/man8/mpcd.8 -#usr/man/man8/zeppelin.8 #usr/sbin/atmaddr #usr/sbin/atmarp #usr/sbin/atmarpd #usr/sbin/atmloop #usr/sbin/atmsigd #usr/sbin/atmtcp +#usr/sbin/br2684ctl #usr/sbin/bus #usr/sbin/enitune #usr/sbin/esi +#usr/sbin/hediag #usr/sbin/ilmid +#usr/sbin/ilmidiag #usr/sbin/lecs #usr/sbin/les #usr/sbin/mpcd #usr/sbin/zeppelin #usr/sbin/zntune +#usr/share/man/man4/atmsigd.conf.4 +#usr/share/man/man7/qos.7 +#usr/share/man/man7/sap.7 +#usr/share/man/man8/atmaddr.8 +#usr/share/man/man8/atmarp.8 +#usr/share/man/man8/atmarpd.8 +#usr/share/man/man8/atmdiag.8 +#usr/share/man/man8/atmdump.8 +#usr/share/man/man8/atmloop.8 +#usr/share/man/man8/atmsigd.8 +#usr/share/man/man8/atmtcp.8 +#usr/share/man/man8/br2684ctl.8 +#usr/share/man/man8/bus.8 +#usr/share/man/man8/esi.8 +#usr/share/man/man8/ilmid.8 +#usr/share/man/man8/lecs.8 +#usr/share/man/man8/les.8 +#usr/share/man/man8/mpcd.8 +#usr/share/man/man8/zeppelin.8 diff --git a/lfs/linux-atm b/lfs/linux-atm index 6465d14..4c32711 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2017 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.4.1 +VER = 2.5.2 THISAPP = linux-atm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 84fef49cc39ff2605204246666f65864 +$(DL_FILE)_MD5 = d49499368c3cf15f73a05d9bce8824a8 install : $(TARGET) @@ -70,8 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-gcc-4.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-arpd_includes.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/src/patches/linux-atm-2.4.1-arpd_includes.patch b/src/patches/linux-atm-2.4.1-arpd_includes.patch deleted file mode 100644 index 1a74ecf..0000000 --- a/src/patches/linux-atm-2.4.1-arpd_includes.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: linux-atm-2.4.1/src/arpd/arp.c -=================================================================== ---- linux-atm-2.4.1.orig/src/arpd/arp.c 2007-10-20 19:19:10.002198470 +0200 -+++ linux-atm-2.4.1/src/arpd/arp.c 2007-10-20 19:19:19.138719139 +0200 -@@ -15,7 +15,6 @@ - #include <sys/types.h> - #include <sys/socket.h> /* for linux/if_arp.h */ - #include <netinet/in.h> /* for ntohs, etc. */ --#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ - #include <linux/if_arp.h> - #include <linux/if_ether.h> - #include <atm.h> -Index: linux-atm-2.4.1/src/arpd/io.c -=================================================================== ---- linux-atm-2.4.1.orig/src/arpd/io.c 2007-10-20 19:19:09.994198016 +0200 -+++ linux-atm-2.4.1/src/arpd/io.c 2007-10-20 19:19:19.154720039 +0200 -@@ -16,12 +16,11 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --#include <net/if.h> -+#include <linux/if.h> - #include <netinet/in.h> - #include <atm.h> - #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */ - #include <linux/atmarp.h> --#define _LINUX_NETDEVICE_H /* glibc2 */ - #include <linux/if_arp.h> - - #include "atmd.h" -Index: linux-atm-2.4.1/src/arpd/itf.c -=================================================================== ---- linux-atm-2.4.1.orig/src/arpd/itf.c 2007-10-20 19:19:10.010198930 +0200 -+++ linux-atm-2.4.1/src/arpd/itf.c 2007-10-20 19:19:19.186721859 +0200 -@@ -12,7 +12,6 @@ - #include <sys/types.h> - #include <linux/atmclip.h> - #include <sys/socket.h> --#define _LINUX_NETDEVICE_H /* glibc2 */ - #include <linux/if_arp.h> - - #include "atmd.h" diff --git a/src/patches/linux-atm-2.4.1-gcc-4.patch b/src/patches/linux-atm-2.4.1-gcc-4.patch deleted file mode 100644 index f6be9d2..0000000 --- a/src/patches/linux-atm-2.4.1-gcc-4.patch +++ /dev/null @@ -1,161 +0,0 @@ -diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-2.4.1/src/ilmid/atmf_uni.c ---- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2005-08-13 10:22:44.000000000 +0100 -@@ -187,7 +187,7 @@ - newPrefix->name = alloc_t(AsnOid); - newPrefix->name->octs = alloc(varBindName->octetLen); - AsnOidCopy(newPrefix->name, varBindName); -- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix); -+ Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix); - if(atmNetPrefix.octs == NULL) - { - atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2; -@@ -197,7 +197,7 @@ - } - else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) - { -- Q_REMOVE((NetPrefixNode *) var->value, prefix); -+ Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix); - } - - return NOERROR; -diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-2.4.1/src/lib/sapequal.c ---- linux-atm-2.4.1-orig/src/lib/sapequal.c 2001-09-03 19:41:05.000000000 +0100 -+++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000 +0000 -@@ -65,6 +65,7 @@ - CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window); - break; - default: -+ ; - } - switch (a.l3_proto) { - case ATM_L3_X25: -@@ -83,6 +84,7 @@ - if (a.l3.user != b.l3.user) return 0; - break; - default: -+ ; - } - return 1; - } -diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-2.4.1/src/maint/atmtcp.c ---- linux-atm-2.4.1-orig/src/maint/atmtcp.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000 +0100 -@@ -60,7 +60,7 @@ - static IN *inputs = NULL; - static fd_set in_set; - static int fds = 0; --static int debug = 0; -+int debug = 0; - static int links = 0; - - -diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-2.4.1/src/maint/enitune.c ---- linux-atm-2.4.1-orig/src/maint/enitune.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/maint/enitune.c 2005-02-06 19:24:37.000000000 +0000 -@@ -44,6 +44,7 @@ - if (*end || mult.rx <= 100) usage(name); - break; - default: -+ ; - } - if (argc != optind+1) usage(name); - sioc.number = strtol(argv[optind],&end,0); -diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c ---- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/mpoad/p_factory.c 2005-08-13 10:22:44.000000000 +0100 -@@ -31,16 +31,17 @@ - * beginning at location "addr". - */ - uint32_t sum = 0; -+ uint16_t *addr16 = addr; - - while( count > 1 ) { - /* This is the inner loop */ -- sum += * ((uint16_t *) addr)++; -+ sum += * addr16++; - count -= 2; - } - - /* Add left-over byte, if any */ - if( count > 0 ) -- sum += * (unsigned char *) addr; -+ sum += * (unsigned char *) addr16; - - /* Fold 32-bit sum to 16 bits */ - while (sum>>16) -diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-2.4.1/src/qgen/qlib.c ---- linux-atm-2.4.1-orig/src/qgen/qlib.c 2001-09-03 19:41:05.000000000 +0100 -+++ linux-atm-2.4.1/src/qgen/qlib.c 2005-08-13 10:22:44.000000000 +0100 -@@ -26,8 +26,6 @@ - #include "op.h" - - --static int debug = 0; -- - - void PREFIX(report)(int severity,const char *msg,...) - { -@@ -830,6 +828,8 @@ - - #ifdef STANDALONE - -+int debug = 0; -+ - int main(int argc,const char **argv) - { - unsigned char msg[5000]; /* should be large enough for that */ -diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-2.4.1/src/qgen/qlib.h ---- linux-atm-2.4.1-orig/src/qgen/qlib.h 2001-09-03 19:41:05.000000000 +0100 -+++ linux-atm-2.4.1/src/qgen/qlib.h 2005-08-13 10:22:44.000000000 +0100 -@@ -23,7 +23,6 @@ - #define Q_FATAL -1 - - --extern int q_dump; - extern void q_report(int severity,const char *msg,...); - - #ifdef DUMP_MODE -diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-2.4.1/src/sigd/proto.c ---- linux-atm-2.4.1-orig/src/sigd/proto.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/sigd/proto.c 2005-02-06 19:24:37.000000000 +0000 -@@ -259,6 +259,7 @@ - break; - } - default: -+ ; - } - va_end(ap); - if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size); -@@ -288,6 +289,7 @@ - } - break; - default: -+ ; - } - va_end(ap); - } -diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-2.4.1/src/switch/debug/debug.c ---- linux-atm-2.4.1-orig/src/switch/debug/debug.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/switch/debug/debug.c 2005-08-13 10:22:44.000000000 +0100 -@@ -18,7 +18,7 @@ - #define COMPONENT "FAB(debug)" - - --#define PRV(call) ((FAB *) (call)->fab) -+#define PRV(call) (*((FAB **) &(call)->fab)) - - - typedef struct _fab { -diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-2.4.1/src/switch/tcp/tcpsw.c ---- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2005-08-13 10:22:44.000000000 +0100 -@@ -27,7 +27,7 @@ - - #define COMPONENT "FAB(tcp)" - --#define PRV(call) ((FAB *) (call)->fab) -+#define PRV(call) (*((FAB **) &(call)->fab)) - - #define MAX_VCI 1024 - -- 2.9.3

2 1

[PATCH] gzip: update to 1.8
by Marcel Lorenz 06 Apr '17

06 Apr '17

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/gzip | 25 ++++++++++++------------- lfs/gzip | 36 ++++++++++++------------------------ 2 files changed, 24 insertions(+), 37 deletions(-) diff --git a/config/rootfiles/common/gzip b/config/rootfiles/common/gzip index f01fb59..c470a38 100644 --- a/config/rootfiles/common/gzip +++ b/config/rootfiles/common/gzip @@ -1,4 +1,3 @@ -#bin/compress bin/gunzip bin/gzip bin/uncompress @@ -13,15 +12,15 @@ bin/zcat #usr/bin/zless #usr/bin/zmore #usr/bin/znew -#usr/info/gzip.info -#usr/man/man1/gunzip.1 -#usr/man/man1/gzexe.1 -#usr/man/man1/gzip.1 -#usr/man/man1/zcat.1 -#usr/man/man1/zcmp.1 -#usr/man/man1/zdiff.1 -#usr/man/man1/zforce.1 -#usr/man/man1/zgrep.1 -#usr/man/man1/zless.1 -#usr/man/man1/zmore.1 -#usr/man/man1/znew.1 +#usr/share/info/gzip.info +#usr/share/man/man1/gunzip.1 +#usr/share/man/man1/gzexe.1 +#usr/share/man/man1/gzip.1 +#usr/share/man/man1/zcat.1 +#usr/share/man/man1/zcmp.1 +#usr/share/man/man1/zdiff.1 +#usr/share/man/man1/zforce.1 +#usr/share/man/man1/zgrep.1 +#usr/share/man/man1/zless.1 +#usr/share/man/man1/zmore.1 +#usr/share/man/man1/znew.1 diff --git a/lfs/gzip b/lfs/gzip index 0afd1ff..537662c 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 1.3.5 +VER = 1.8 THISAPP = gzip-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -35,14 +35,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=/tools --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = endif ############################################################################### @@ -53,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3d6c191dfd2bf307014b421c12dc8469 +$(DL_FILE)_MD5 = f7caabb65cddc1a4165b398009bd05b9 install : $(TARGET) @@ -82,23 +78,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(ROOT)" "" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch -endif + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install ifeq "$(ROOT)" "" - cd $(DIR_APP) && sed -i 's@"BINDIR"@/bin@g' gzexe.in -endif - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install -ifeq "$(ROOT)" "" - mv -v /usr/bin/gzip /bin - rm -v /usr/bin/{gunzip,zcat} - ln -sv gzip /bin/gunzip - ln -sv gzip /bin/zcat - ln -sv gzip /bin/compress - ln -sv gunzip /bin/uncompress + ln -sfv gzip /bin/gunzip + ln -sfv gzip /bin/zcat + mv -v /bin/{gzexe,zcmp,zdiff,zegrep} /usr/bin + mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin endif @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.9.3

2 1

Re: [PATCH] DNS: Fall back to permissive mode if recursor mode is unavailable
by Paul Simmons 02 Apr '17

02 Apr '17

On Tue, 2017-03-07 at 09:58 -0600, Paul Simmons wrote: > On Tue, 2017-03-07 at 12:06 +0000, Michael Tremer wrote: > > No, it is supposed to resolve everything. > > > > For that it only needs to be able to contact the root name servers > > and practically all others on the internet. That seems to fail > > here. > > > > What does unbound log? > > > > > On 6 Mar 2017, at 11:29 pm, Paul Simmons <redneckmother(a)hughes.ne > > > t> > > > wrote: > > > > > > > On Mon, 2017-03-06 at 22:37 +0000, Michael Tremer wrote: > > > > Hi, > > > > > > > > > On Mon, 2017-03-06 at 15:47 -0600, Paul Simmons wrote: > > > > > > On Mon, 2017-03-06 at 21:00 +0000, Michael Tremer wrote: > > > > > > > > > > > > Hi, > > > > > > > > > > > > > On Mon, 2017-03-06 at 12:18 -0600, Paul Simmons wrote: > > > > > > > > > > > > > > > On Sun, 2017-03-05 at 11:42 +0000, Michael Tremer > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > Hi, > > > > > > > > > > > > > > > > can you confirm if unbound is running? > > > > > > > > > > > > > > > > What is the output of /etc/init.d/unbound restart? > > > > > > > > > > > > > > > > -Michael > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ----<% snip %>---- > > > > > > > > > > > > > > > > > > > > I have nightly commit > > > > > > > > > > c016773b9816ad9be4ffc8643c30457e87c094e3 > > > > > > > > > > available locally, and will beg my users for > > > > > > > > > > downtime > > > > > > > > > > to > > > > > > > > > > test. > > > > > > > > > > > > > > > > > > > > Thank you, and best regards, > > > > > > > > > > Paul > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Bad juju - build c016773b couldn't resolve any hosts > > > > > > > > > (other > > > > > > > > > than > > > > > > > > > those in "localdomain"). > > > > > > > > > > > > > > > > > > Provider is "hughes.net" and is the only ISP > > > > > > > > > available > > > > > > > > > (no > > > > > > > > > hardlines > > > > > > > > > or other LOS/NLOS WISPs available). > > > > > > > > > > > > > > > > > > Tried assigning DNS servers 74.113.60.185 and > > > > > > > > > 156.154.70.1 > > > > > > > > > - no > > > > > > > > > change. > > > > > > > > > > > > > > > > > > Paul > > > > > > > > > > > > > > > > > > > > > > > Sorry for the lllooonnnggg delay - had to get a testing > > > > > > > time > > > > > > > window. > > > > > > > > > > > > > > Unbound was indeed running - verified with > > > > > > > "/etc/init.d/unbound > > > > > > > status" > > > > > > > > > > > > > > Command and output from "restart": > > > > > > > > > > > > > > # /etc/init.d/unbound restart > > > > > > > Stopping Unbound DNS > > > > > > > Proxy... [ OK > > > > > > > ] > > > > > > > Starting Unbound DNS > > > > > > > Proxy... [ OK > > > > > > > ] > > > > > > > Ignoring broken upstream name server(s): 74.113.60.185 > > > > > > > 156.154.70.1 [ WARN ] > > > > > > > Falling back to recursor > > > > > > > mode [ WARN ] > > > > > > > > > > > > So, can you remind me what your provider does again? Is any > > > > > > access to > > > > > > other name > > > > > > servers forbidden? If so the updated script should have > > > > > > detected > > > > > > that > > > > > > and should > > > > > > not have activated the recursor mode. > > > > > > > > > > > > Could you manually execute the following commands from the > > > > > > console of > > > > > > IPFire for > > > > > > me? > > > > > > > > > > > > dig @198.41.0.4 +dnssec SOA . > > > > > > > > > > > > The dot at the end is important. What is the output of it? > > > > > > > > > > > > Best, > > > > > > -Michael > > > > > > > > > > > > > > > > > > > > > > > > > > > Thank you, > > > > > > > Paul > > > > > > > > > > # dig @198.41.0.4 +dnssec SOA . > > > > > > > > > > ; <<>> DiG 9.11.0-P3 <<>> @198.41.0.4 +dnssec SOA . > > > > > ; (1 server found) > > > > > ;; global options: +cmd > > > > > ;; Got answer: > > > > > ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 811 > > > > > ;; flags: qr aa rd; QUERY: 1, ANSWER: 2, AUTHORITY: 14, > > > > > ADDITIONAL: > > > > > 27 > > > > > ;; WARNING: recursion requested but not available > > > > > > > > > > ;; OPT PSEUDOSECTION: > > > > > ; EDNS: version: 0, flags: do; udp: 4096 > > > > > ;; QUESTION SECTION: > > > > > ;. IN SOA > > > > > > > > > > ;; ANSWER SECTION: > > > > > . 86400 IN SOA a.root- > > > > > servers.net. nstld.verisign-grs.com. 2017030601 1800 900 > > > > > 604800 > > > > > 86400 > > > > > . 86400 IN RRSIG SOA 8 > > > > > 0 > > > > > 86400 20170319170000 20170306160000 61045 . > > > > > X2xWv3z0ZmFxXkF9ybMgxMv6dcZ+SmnG3XHcNtAavuPNPLW3cVBwolDP > > > > > lOU5/tfOaKwbu7HENFWysaekMpb6O7ycg+kryuCP7z6Q4WyG0O2160l1 > > > > > DDG0UbBW5yidfcghq1r6sdz30RI5cSBGcAOmlktnPkjs9wv9/S/ZPyrC > > > > > qMPJR9A60R52NcWEONS3DiyGxR66KA4S4grJnDgcI6pcytJGXm/b5WRO > > > > > +v51tnLT0UVbgXvV03Itn/3MR72muzKXWzzj5LFJST5iqWCgAHJryG3T > > > > > vNKEYLQ76nwl6B3YVJDjC1InmpIujwXBbxMKpyL1Sh0RLdlHq2TtZS8O > > > > > qk4V0Q== > > > > > > > > > > ;; AUTHORITY SECTION: > > > > > . 518400 IN NS e.root- > > > > > servers.net. > > > > > . 518400 IN NS h.root- > > > > > servers.net. > > > > > . 518400 IN NS l.root- > > > > > servers.net. > > > > > . 518400 IN NS i.root- > > > > > servers.net. > > > > > . 518400 IN NS a.root- > > > > > servers.net. > > > > > . 518400 IN NS d.root- > > > > > servers.net. > > > > > . 518400 IN NS c.root- > > > > > servers.net. > > > > > . 518400 IN NS b.root- > > > > > servers.net. > > > > > . 518400 IN NS j.root- > > > > > servers.net. > > > > > . 518400 IN NS k.root- > > > > > servers.net. > > > > > . 518400 IN NS g.root- > > > > > servers.net. > > > > > . 518400 IN NS m.root- > > > > > servers.net. > > > > > . 518400 IN NS f.root- > > > > > servers.net. > > > > > . 518400 IN RRSIG NS 8 > > > > > 0 > > > > > 518400 20170319170000 20170306160000 61045 . > > > > > iQVPY67dNDj6w14dY1tDFgwRFqhEXVVLmY8q1woIX1eU7t1k/XaPi+tX > > > > > 3+PDCFQlrQmWSWUtLPaA6pmrACB6EL2YvWzAiLVyocGCBpUpnbUCNAwm > > > > > nD4SvBZb0ET2jWbSiAzo8iy+1+Hr84I8RXtbcrcpF5Y/J5Oataxt5z9o > > > > > dHGQSKru0eYEbwfszq0L5L8KECk6skm7iQ0RAIspdTfjDsIwtvoAhEGV > > > > > B8qjFQP5Bkcn38b35eWHneCmc3cgG0J+pK/eX/YHpqClcINGh3eavBlC > > > > > 1KpUkDDMAwCvo+X/MhDE2Ol/VR00/M/YCzXbEv97IWenM1Xi4ArX9F1C > > > > > xBc0gA== > > > > > > > > > > ;; ADDITIONAL SECTION: > > > > > e.root-servers.net. 518400 IN A 192.203 > > > > > .230 > > > > > .10 > > > > > e.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :a8::e > > > > > h.root-servers.net. 518400 IN A 198.97. > > > > > 190. > > > > > 53 > > > > > h.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :1::53 > > > > > l.root-servers.net. 518400 IN A 199.7.8 > > > > > 3.42 > > > > > l.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :9f::42 > > > > > i.root-servers.net. 518400 IN A 192.36. > > > > > 148. > > > > > 17 > > > > > i.root-servers.net. 518400 IN AAAA 2001 > > > > > :7fe > > > > > ::53 > > > > > a.root-servers.net. 518400 IN A 198.41. > > > > > 0.4 > > > > > a.root-servers.net. 518400 IN AAAA 2001 > > > > > :503 > > > > > :ba3e::2:30 > > > > > d.root-servers.net. 518400 IN A 199.7.9 > > > > > 1.13 > > > > > d.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :2d::d > > > > > c.root-servers.net. 518400 IN A 192.33. > > > > > 4.12 > > > > > c.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :2::c > > > > > b.root-servers.net. 518400 IN A 192.228 > > > > > .79. > > > > > 201 > > > > > b.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :84::b > > > > > j.root-servers.net. 518400 IN A 192.58. > > > > > 128. > > > > > 30 > > > > > j.root-servers.net. 518400 IN AAAA 2001 > > > > > :503 > > > > > :c27::2:30 > > > > > k.root-servers.net. 518400 IN A 193.0.1 > > > > > 4.12 > > > > > 9 > > > > > k.root-servers.net. 518400 IN AAAA 2001 > > > > > :7fd > > > > > ::1 > > > > > g.root-servers.net. 518400 IN A 192.112 > > > > > .36. > > > > > 4 > > > > > g.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :12::d0d > > > > > m.root-servers.net. 518400 IN A 202.12. > > > > > 27.3 > > > > > 3 > > > > > m.root-servers.net. 518400 IN AAAA 2001 > > > > > :dc3 > > > > > ::35 > > > > > f.root-servers.net. 518400 IN A 192.5.5 > > > > > .241 > > > > > f.root-servers.net. 518400 IN AAAA 2001 > > > > > :500 > > > > > :2f::f > > > > > > > > > > ;; Query time: 836 msec > > > > > ;; SERVER: 198.41.0.4#53(198.41.0.4) > > > > > ;; WHEN: Mon Mar 06 15:40:58 CST 2017 > > > > > ;; MSG SIZE rcvd: 1440 > > > > > # > > > > > > > > > > I suspect the ISP mangles DNS requests directed outside their > > > > > net. > > > > > > > > Well, that command shouldn't have worked then. > > > > > > > > Could you give me an example for something that you cannot > > > > resolve? > > > > > > > > -Michael > > > > > > > > > Thank you, > > > > > Paul > > > > > > Ah, I see... so the problem is that we're not forwarding requests > > > outside the local domain? Latest testing sequence follows: > > > > > > # /etc/init.d/unbound restart > > > Stopping Unbound DNS > > > Proxy... [ OK ] > > > Starting Unbound DNS > > > Proxy... [ OK ] > > > Ignoring broken upstream name server(s): 74.113.60.185 > > > 156.154.70.1 [ WARN ] > > > Falling back to recursor > > > mode [ WARN ] > > > > > > # dig @198.41.0.4 +dnssec SOA . > > > > > > ; <<>> DiG 9.11.0-P3 <<>> @198.41.0.4 +dnssec SOA . > > > ; (1 server found) > > > ;; global options: +cmd > > > ;; Got answer: > > > ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 23002 > > > ;; flags: qr aa rd; QUERY: 1, ANSWER: 2, AUTHORITY: 14, > > > ADDITIONAL: > > > 27 > > > ;; WARNING: recursion requested but not available > > > > > > ;; OPT PSEUDOSECTION: > > > ; EDNS: version: 0, flags: do; udp: 1472 > > > ;; QUESTION SECTION: > > > ;. IN SOA > > > > > > ;; ANSWER SECTION: > > > . 86400 IN SOA a.root-servers.net. > > > nstld.verisign-grs.com. 2017030601 1800 900 604800 86400 > > > . 86400 IN RRSIG SOA 8 0 86400 20170319170000 > > > 20170306160000 61045 . > > > X2xWv3z0ZmFxXkF9ybMgxMv6dcZ+SmnG3XHcNtAavuPNPLW3cVBwolDP > > > lOU5/tfOaKwbu7HENFWysaekMpb6O7ycg+kryuCP7z6Q4WyG0O2160l1 > > > DDG0UbBW5yidfcghq1r6sdz30RI5cSBGcAOmlktnPkjs9wv9/S/ZPyrC > > > qMPJR9A60R52NcWEONS3DiyGxR66KA4S4grJnDgcI6pcytJGXm/b5WRO > > > +v51tnLT0UVbgXvV03Itn/3MR72muzKXWzzj5LFJST5iqWCgAHJryG3T > > > vNKEYLQ76nwl6B3YVJDjC1InmpIujwXBbxMKpyL1Sh0RLdlHq2TtZS8O qk4V0Q== > > > > > > ;; AUTHORITY SECTION: > > > . 518400 IN NS a.root-servers.net. > > > . 518400 IN NS b.root-servers.net. > > > . 518400 IN NS c.root-servers.net. > > > . 518400 IN NS d.root-servers.net. > > > . 518400 IN NS e.root-servers.net. > > > . 518400 IN NS f.root-servers.net. > > > . 518400 IN NS g.root-servers.net. > > > . 518400 IN NS h.root-servers.net. > > > . 518400 IN NS i.root-servers.net. > > > . 518400 IN NS j.root-servers.net. > > > . 518400 IN NS k.root-servers.net. > > > . 518400 IN NS l.root-servers.net. > > > . 518400 IN NS m.root-servers.net. > > > . 518400 IN RRSIG NS 8 0 518400 > > > 20170319170000 > > > 20170306160000 61045 . > > > iQVPY67dNDj6w14dY1tDFgwRFqhEXVVLmY8q1woIX1eU7t1k/XaPi+tX > > > 3+PDCFQlrQmWSWUtLPaA6pmrACB6EL2YvWzAiLVyocGCBpUpnbUCNAwm > > > nD4SvBZb0ET2jWbSiAzo8iy+1+Hr84I8RXtbcrcpF5Y/J5Oataxt5z9o > > > dHGQSKru0eYEbwfszq0L5L8KECk6skm7iQ0RAIspdTfjDsIwtvoAhEGV > > > B8qjFQP5Bkcn38b35eWHneCmc3cgG0J+pK/eX/YHpqClcINGh3eavBlC > > > 1KpUkDDMAwCvo+X/MhDE2Ol/VR00/M/YCzXbEv97IWenM1Xi4ArX9F1C xBc0gA== > > > > > > ;; ADDITIONAL SECTION: > > > a.root-servers.net. 518400 IN A 198.41.0.4 > > > b.root-servers.net. 518400 IN A 192.228.79.201 > > > c.root-servers.net. 518400 IN A 192.33.4.12 > > > d.root-servers.net. 518400 IN A 199.7.91.13 > > > e.root-servers.net. 518400 IN A 192.203.230.10 > > > f.root-servers.net. 518400 IN A 192.5.5.241 > > > g.root-servers.net. 518400 IN A 192.112.36.4 > > > h.root-servers.net. 518400 IN A 198.97.190.53 > > > i.root-servers.net. 518400 IN A 192.36.148.17 > > > j.root-servers.net. 518400 IN A 192.58.128.30 > > > k.root-servers.net. 518400 IN A 193.0.14.129 > > > l.root-servers.net. 518400 IN A 199.7.83.42 > > > m.root-servers.net. 518400 IN A 202.12.27.33 > > > a.root- > > > servers.net. 518400 IN AAAA 2001:503:ba3e::2:30 > > > b.root-servers.net. 518400 IN AAAA 2001:500:84::b > > > c.root-servers.net. 518400 IN AAAA 2001:500:2::c > > > d.root-servers.net. 518400 IN AAAA 2001:500:2d::d > > > e.root-servers.net. 518400 IN AAAA 2001:500:a8::e > > > f.root-servers.net. 518400 IN AAAA 2001:500:2f::f > > > g.root-servers.net. 518400 IN AAAA 2001:500:12::d0d > > > h.root-servers.net. 518400 IN AAAA 2001:500:1::53 > > > i.root-servers.net. 518400 IN AAAA 2001:7fe::53 > > > j.root-servers.net. 518400 IN AAAA 2001:503:c27::2:30 > > > k.root-servers.net. 518400 IN AAAA 2001:7fd::1 > > > l.root-servers.net. 518400 IN AAAA 2001:500:9f::42 > > > m.root-servers.net. 518400 IN AAAA 2001:dc3::35 > > > > > > ;; Query time: 797 msec > > > ;; SERVER: 198.41.0.4#53(198.41.0.4) > > > ;; WHEN: Mon Mar 06 17:03:12 CST 2017 > > > ;; MSG SIZE rcvd: 1440 > > > > > > # host www.google.com > > > Host www.google.com not found: 2(SERVFAIL) > > > > > > # host www.ipfire.org > > > ;; connection timed out; no servers could be reached > > > > > > > > > # nslookup www.google.com > > > Server: 127.0.0.1 > > > Address: 127.0.0.1#53 > > > > > > ** server can't find www.google.com: SERVFAIL > > > > > > # nslookup www.ipfire.org 8.8.8.8 > > > Server: 8.8.8.8 > > > Address: 8.8.8.8#53 > > > > > > Non-authoritative answer: > > > www.ipfire.org class="Apple-tab-span" style="white- > > > space:pre"> canonical name = web01.ipfire.org. > > > Name: web01.ipfire.org > > > Address: 81.3.27.41 > > > > > > > > > Thanks, > > > Paul > > > > > Log from unbound (via web interface): > > IPFire diagnostics > Section: unbound > Date: March 07, 2017 > > 09:53:05 unbound: [3485:0] info: validation failure > ns02.fedoraproject.org. AAAA IN > 09:53:05 unbound: [3485:0] info: validation failure > ns05.fedoraproject.org. AAAA IN > 09:53:05 unbound: [3485:0] info: validation failure > fedoraproject.org. AAAA IN > 09:52:36 unbound: [3485:1] info: validation failure > fedoraproject.org.localdomain. AAAA IN > 09:52:29 unbound: [3485:0] info: failed to prime trust anchor -- > could not fetch DNSKEY rrset . DNSKEY IN > 09:52:19 unbound: [3485:0] info: failed to prime trust anchor -- > could not fetch DNSKEY rrset . DNSKEY IN > 09:51:29 unbound: [3485:0] info: start of service (unbound 1.6.1). > 09:51:29 unbound: [3485:0] notice: init module 1: iterator > 09:51:29 unbound: [3485:0] notice: init module 0: validator > 09:51:27 unbound: [1406:0] info: 4.000000 8.000000 1 > 09:51:27 unbound: [1406:0] info: 2.000000 4.000000 1 > 09:51:27 unbound: [1406:0] info: 0.524288 1.000000 2 > 09:51:27 unbound: [1406:0] info: 0.262144 0.524288 5 > 09:51:27 unbound: [1406:0] info: 0.131072 0.262144 1 > 09:51:27 unbound: [1406:0] info: 0.016384 0.032768 1 > 09:51:27 unbound: [1406:0] info: 0.008192 0.016384 1 > 09:51:27 unbound: [1406:0] info: 0.000000 0.000001 7 > 09:51:27 unbound: [1406:0] info: lower(secs) upper(secs) recursions > 09:51:27 unbound: [1406:0] info: [25%]=6.78571e-07 > median[50%]=0.196608 [75%]=0.484966 > 09:51:27 unbound: [1406:0] info: histogram of recursion processing > times > 09:51:27 unbound: [1406:0] info: average recursion processing time > 0.581705 sec > 09:51:27 unbound: [1406:0] info: server stats for thread 1: > requestlist max 3 avg 0.526316 exceeded 0 jostled 0 > 09:51:27 unbound: [1406:0] info: server stats for thread 1: 45 > queries, 26 answers from cache, 19 recursions, 0 prefetch, 0 rejected > by ip ratelimiting > 09:51:27 unbound: [1406:0] info: 32.000000 64.000000 6 > 09:51:27 unbound: [1406:0] info: 16.000000 32.000000 6 > 09:51:27 unbound: [1406:0] info: 8.000000 16.000000 11 > 09:51:27 unbound: [1406:0] info: 4.000000 8.000000 5 > 09:51:27 unbound: [1406:0] info: 2.000000 4.000000 2 > 09:51:27 unbound: [1406:0] info: 1.000000 2.000000 2 > 09:51:27 unbound: [1406:0] info: 0.262144 0.524288 4 > 09:51:27 unbound: [1406:0] info: 0.131072 0.262144 1 > 09:51:27 unbound: [1406:0] info: 0.000000 0.000001 2 > 09:51:27 unbound: [1406:0] info: lower(secs) upper(secs) recursions > 09:51:27 unbound: [1406:0] info: [25%]=2.75 median[50%]=10.5455 > [75%]=22 > 09:51:27 unbound: [1406:0] info: histogram of recursion processing > times > 09:51:27 unbound: [1406:0] info: average recursion processing time > 15.696339 sec > 09:51:27 unbound: [1406:0] info: server stats for thread 0: > requestlist max 68 avg 23.925 exceeded 0 jostled 0 > 09:51:27 unbound: [1406:0] info: server stats for thread 0: 67 > queries, 28 answers from cache, 39 recursions, 1 prefetch, 0 rejected > by ip ratelimiting > 09:51:27 unbound: [1406:0] info: service stopped (unbound 1.6.1). > 09:50:18 unbound: [1406:0] info: validation failure b.gtld- > servers.net. AAAA IN > 09:50:18 unbound: [1406:0] info: validation failure a.gtld- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure a.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure m.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure c.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure b.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure l.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure k.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure j.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure i.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure h.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure g.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure f.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure e.root- > servers.net. AAAA IN > 09:50:17 unbound: [1406:0] info: validation failure d.root- > servers.net. AAAA IN > 09:49:55 unbound: [1406:0] info: validation failure > ns02.fedoraproject.org. AAAA IN > 09:49:55 unbound: [1406:0] info: validation failure > ns05.fedoraproject.org. AAAA IN > 09:49:51 unbound: [1406:0] info: validation failure > fedoraproject.org. AAAA IN > 09:49:48 unbound: [1406:0] info: validation failure > fireinfo.ipfire.org. AAAA IN > 09:49:46 unbound: [1406:0] info: validation failure > ns1.lightningwirelabs.com. AAAA IN > 09:49:46 unbound: [1406:0] info: validation failure > ns3.lightningwirelabs.com. AAAA IN > 09:49:46 unbound: [1406:0] info: validation failure > ns2.lightningwirelabs.com. AAAA IN > 09:49:42 unbound: [1406:1] info: validation failure > fedoraproject.org. AAAA IN > 09:49:18 unbound: [1406:0] info: validation failure > fedoraproject.org.localdomain. AAAA IN > 09:49:18 unbound: [1406:0] info: validation failure > fireinfo.ipfire.org.localdomain. AAAA IN > 09:48:21 unbound: [1406:0] info: start of service (unbound 1.6.1). > 09:48:21 unbound: [1406:0] notice: init module 1: iterator > 09:48:21 unbound: [1406:0] notice: init module 0: validator > > > Thank you, > Paul Forgot to cc: the list...Paul

2 9

[PATCH] motion 4.0.1: new config file
by Matthias Fischer 28 Mar '17

28 Mar '17

This is the new config file for 'motion 4.0.1'. Several keys were renamed since 3.2.12, others adapted, some are completely new. I tried to take care of existing keys and values. This one needs testing. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/motion/motion.conf | 413 ++++++++++++++++++++++++++++++---------------- 1 file changed, 273 insertions(+), 140 deletions(-) diff --git a/config/motion/motion.conf b/config/motion/motion.conf index 0d2853ada..52a1ab235 100644 --- a/config/motion/motion.conf +++ b/config/motion/motion.conf @@ -1,6 +1,6 @@ # Rename this distribution example file to motion.conf # -# This config file was generated by motion 3.2.11 +# This config file was generated by motion 4.0.1 ############################################################ @@ -20,6 +20,16 @@ process_id_file /var/run/motion.pid # Start in Setup-Mode, daemon disabled. (default: off) setup_mode off + +# Use a file to save logs messages, if not defined stderr and syslog is used. (default: not defined) +;logfile /tmp/motion.log + +# Level of log messages [1..9] (EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL). (default: 6 / NTC) +log_level 6 + +# Filter to log messages by type (COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL). (default: ALL) +log_type all + ########################################################### # Capture device options ############################################################ @@ -28,32 +38,43 @@ setup_mode off # for FreeBSD default is /dev/bktr0 videodevice /dev/video0 -# v4l2_palette allows to choose preferable palette to be use by motion -# to capture from those supported by your videodevice. (default: 8) +# v4l2_palette allows one to choose preferable palette to be use by motion +# to capture from those supported by your videodevice. (default: 17) # E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and # V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG. -# Setting v4l2_palette to 1 forces motion to use V4L2_PIX_FMT_SBGGR8 +# Setting v4l2_palette to 2 forces motion to use V4L2_PIX_FMT_SBGGR8 # instead. # # Values : # V4L2_PIX_FMT_SN9C10X : 0 'S910' -# V4L2_PIX_FMT_SBGGR8 : 1 'BA81' -# V4L2_PIX_FMT_MJPEG : 2 'MJPEG' -# V4L2_PIX_FMT_JPEG : 3 'JPEG' -# V4L2_PIX_FMT_RGB24 : 4 'RGB3' -# V4L2_PIX_FMT_UYVY : 5 'UYVY' -# V4L2_PIX_FMT_YUYV : 6 'YUYV' -# V4L2_PIX_FMT_YUV422P : 7 '422P' -# V4L2_PIX_FMT_YUV420 : 8 'YU12' -v4l2_palette 8 +# V4L2_PIX_FMT_SBGGR16 : 1 'BYR2' +# V4L2_PIX_FMT_SBGGR8 : 2 'BA81' +# V4L2_PIX_FMT_SPCA561 : 3 'S561' +# V4L2_PIX_FMT_SGBRG8 : 4 'GBRG' +# V4L2_PIX_FMT_SGRBG8 : 5 'GRBG' +# V4L2_PIX_FMT_PAC207 : 6 'P207' +# V4L2_PIX_FMT_PJPG : 7 'PJPG' +# V4L2_PIX_FMT_MJPEG : 8 'MJPEG' +# V4L2_PIX_FMT_JPEG : 9 'JPEG' +# V4L2_PIX_FMT_RGB24 : 10 'RGB3' +# V4L2_PIX_FMT_SPCA501 : 11 'S501' +# V4L2_PIX_FMT_SPCA505 : 12 'S505' +# V4L2_PIX_FMT_SPCA508 : 13 'S508' +# V4L2_PIX_FMT_UYVY : 14 'UYVY' +# V4L2_PIX_FMT_YUYV : 15 'YUYV' +# V4L2_PIX_FMT_YUV422P : 16 '422P' +# V4L2_PIX_FMT_YUV420 : 17 'YU12' +# +v4l2_palette 17 # Tuner device to be used for capturing using tuner as source (default /dev/tuner0) # This is ONLY used for FreeBSD. Leave it commented out for Linux ; tunerdevice /dev/tuner0 -# The video input to be used (default: 8) -# Should normally be set to 0 or 1 for video/TV cards, and 8 for USB cameras -input 8 +# The video input to be used (default: -1) +# Should normally be set to 0 or 1 for video/TV cards, and -1 for USB cameras +# Set to 0 for uvideo(4) on OpenBSD +input -1 # The video norm to use (only for video capture and TV tuner cards) # Values: 0 (PAL), 1 (NTSC), 2 (SECAM), 3 (PAL NC no colour). Default: 0 (PAL) @@ -62,8 +83,17 @@ norm 0 # The frequency to set the tuner to (kHz) (only for TV tuner cards) (default: 0) frequency 0 +# Override the power line frequency for the webcam. (normally not necessary) +# Values: +# -1 : Do not modify device setting +# 0 : Power line frequency Disabled +# 1 : 50hz +# 2 : 60hz +# 3 : Auto +power_line_frequency -1 + # Rotate image this number of degrees. The rotation affects all saved images as -# well as mpeg movies. Valid values: 0 (default = no rotation), 90, 180 and 270. +# well as movies. Valid values: 0 (default = no rotation), 90, 180 and 270. rotate 0 # Image width (pixels). Valid range: Camera dependent, default: 352 @@ -81,8 +111,9 @@ framerate 2 # This option is used when you want to capture images at a rate lower than 2 per second. minimum_frame_time 0 -# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// or file:///) -# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. Default: Not defined +# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// mjpg:// rtsp:// mjpeg:// or file:///) +# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. A trailing slash may be required for some cameras. +# Default: Not defined ; netcam_url value # Username and password for network camera (only if required). Default: not defined @@ -90,21 +121,33 @@ minimum_frame_time 0 ; netcam_userpass value # The setting for keep-alive of network socket, should improve performance on compatible net cameras. -# 1.0: The historical implementation using HTTP/1.0, closing the socket after each http request. -# keep_alive: Use HTTP/1.0 requests with keep alive header to reuse the same connection. -# 1.1: Use HTTP/1.1 requests that support keep alive as default. -# Default: 1.0 -; netcam_http 1.0 +# off: The historical implementation using HTTP/1.0, closing the socket after each http request. +# force: Use HTTP/1.0 requests with keep alive header to reuse the same connection. +# on: Use HTTP/1.1 requests that support keep alive as default. +# Default: off +netcam_keepalive off # URL to use for a netcam proxy server, if required, e.g. "http://myproxy". # If a port number other than 80 is needed, use "http://myproxy:1234". # Default: not defined -; netcam_proxy value +; netcam_proxy value # Set less strict jpeg checks for network cameras with a poor/buggy firmware. # Default: off netcam_tolerant_check off +# RTSP connection uses TCP to communicate to the camera. Can prevent image corruption. +# Default: on +rtsp_uses_tcp on + +# Name of camera to use if you are using a camera accessed through OpenMax/MMAL +# Default: Not defined +; mmalcam_name vc.ril.camera + +# Camera control parameters (see raspivid/raspistill tool documentation) +# Default: Not defined +; mmalcam_control_params -hf + # Let motion regulate the brightness of a video device (default: off). # The auto_brightness feature uses the brightness option as its target value. # If brightness is zero auto_brightness will adjust to average brightness value 128. @@ -165,12 +208,13 @@ noise_tune on # Recommended value is EedDl. Any combination (and number of) of E, e, d, and D is valid. # (l)abeling must only be used once and the 'l' must be the last letter. # Comment out to disable -despeckle EedDl +despeckle_filter EedDl # Detect motion in predefined areas (1 - 9). Areas are numbered like that: 1 2 3 # A script (on_area_detected) is started immediately when motion is 4 5 6 # detected in one of the given areas, but only once during an event. 7 8 9 -# One or more areas can be specified with this option. (Default: not defined) +# One or more areas can be specified with this option. Take care: This option +# does NOT restrict detection to these areas! (Default: not defined) ; area_detect value # PGM file to use as a sensitivity mask. @@ -194,24 +238,26 @@ minimum_motion_frames 1 # was detected that will be output at motion detection. # Recommended range: 0 to 5 (default: 0) # Do not use large values! Large values will cause Motion to skip video frames and -# cause unsmooth mpegs. To smooth mpegs use larger values of post_capture instead. +# cause unsmooth movies. To smooth movies use larger values of post_capture instead. pre_capture 5 # Number of frames to capture after motion is no longer detected (default: 0) post_capture 5 -# Gap is the seconds of no motion detection that triggers the end of an event +# Event Gap is the seconds of no motion detection that triggers the end of an event. # An event is defined as a series of motion images taken within a short timeframe. -# Recommended value is 60 seconds (Default). The value 0 is allowed and disables -# events causing all Motion to be written to one single mpeg file and no pre_capture. -gap 0 - -# Maximum length in seconds of an mpeg movie -# When value is exceeded a new mpeg file is created. (Default: 0 = infinite) +# Recommended value is 60 seconds (Default). The value -1 is allowed and disables +# events causing all Motion to be written to one single movie file and no pre_capture. +# If set to 0, motion is running in gapless mode. Movies don't have gaps anymore. An +# event ends right after no more motion is detected and post_capture is over. +event_gap 0 + +# Maximum length in seconds of a movie +# When value is exceeded a new movie file is created. (Default: 0 = infinite) max_mpeg_time 86400 # Always save images even if there was no motion (default: off) -output_all off +emulate_motion off ############################################################ @@ -224,33 +270,34 @@ output_all off # Picture with most motion of an event is saved when set to 'best'. # Picture with motion nearest center of picture is saved when set to 'center'. # Can be used as preview shot for the corresponding movie. -output_normal off +output_pictures off # Output pictures with only the pixels moving object (ghost images) (default: off) -output_motion off +output_debug_pictures off # The quality (in percent) to be used by the jpeg compression (default: 75) quality 75 -# Output ppm images instead of jpeg (default: off) -ppm off +# Type of output images +# Valid values: jpeg, ppm (default: jpeg) +picture_type jpeg ############################################################ # FFMPEG related options -# Film (mpeg) file output, and deinterlacing of the video input +# Film (movies) file output, and deinterlacing of the video input # The options movie_filename and timelapse_filename are also used # by the ffmpeg feature ############################################################ -# Use ffmpeg to encode mpeg movies in realtime (default: off) -ffmpeg_cap_new off +# Use ffmpeg to encode movies in realtime (default: off) +ffmpeg_output_movies off # Use ffmpeg to make movies with only the pixels moving # object (ghost images) (default: off) -ffmpeg_cap_motion off +ffmpeg_output_debug_movies off -# Use ffmpeg to encode a timelapse movie +# Use ffmpeg to encode a timelapse movie # Default value 0 = off - else save frame every Nth second ffmpeg_timelapse 0 @@ -265,26 +312,58 @@ ffmpeg_bps 500000 # Enables and defines variable bitrate for the ffmpeg encoder. # ffmpeg_bps is ignored if variable bitrate is enabled. # Valid values: 0 (default) = fixed bitrate defined by ffmpeg_bps, -# or the range 2 - 31 where 2 means best quality and 31 is worst. +# or the range 1 - 100 where 1 means worst quality and 100 is best. ffmpeg_variable_bitrate 0 # Codec to used by ffmpeg for the video compression. -# Timelapse mpegs are always made in mpeg1 format independent from this option. -# Supported formats are: mpeg1 (ffmpeg-0.4.8 only), mpeg4 (default), and msmpeg4. -# mpeg1 - gives you files with extension .mpg +# Timelapse videos have two options. +# mpg - Creates mpg file with mpeg-2 encoding. +# If motion is shutdown and restarted, new pics will be appended +# to any previously created file with name indicated for timelapse. +# mpeg4 - Creates avi file with the default encoding. +# If motion is shutdown and restarted, new pics will create a +# new file with the name indicated for timelapse. +# Supported formats are: # mpeg4 or msmpeg4 - gives you files with extension .avi # msmpeg4 is recommended for use with Windows Media Player because # it requires no installation of codec on the Windows client. # swf - gives you a flash film with extension .swf # flv - gives you a flash video with extension .flv -# ffv1 - FF video codec 1 for Lossless Encoding ( experimental ) -# mov - QuickTime ( testing ) -ffmpeg_video_codec msmpeg4 +# ffv1 - FF video codec 1 for Lossless Encoding +# mov - QuickTime +# mp4 - MPEG-4 Part 14 H264 encoding +# mkv - Matroska H264 encoding +# hevc - H.265 / HEVC (High Efficiency Video Coding) +ffmpeg_video_codec mpeg4 + +# When creating videos, should frames be duplicated in order +# to keep up with the requested frames per second +# (default: true) +ffmpeg_duplicate_frames true + +############################################################ +# SDL Window +############################################################ + +# Number of motion thread to show in SDL Window (default: 0 = disabled) +#sdl_threadnr 0 + +############################################################ +# External pipe to video encoder +# Replacement for FFMPEG builtin encoder for ffmpeg_output_movies only. +# The options movie_filename and timelapse_filename are also used +# by the ffmpeg feature +############################################################# -# Use ffmpeg to deinterlace video. Necessary if you use an analog camera -# and see horizontal combing on moving objects in video or pictures. -# (default: off) -ffmpeg_deinterlace off +# Bool to enable or disable extpipe (default: off) +use_extpipe off + +# External program (full path and opts) to pipe raw video to +# Generally, use '-' for STDIN... +;extpipe mencoder -demuxer rawvideo -rawvideo w=%w:h=%h:i420 -ovc x264 -x264encopts bframes=4:frameref=1:subq=1:scenecut=-1:nob_adapt:threads=1:keyint=1000:8x8dct:vbv_bufsize=4000:crf=24:partitions=i8x8,i4x4:vbv_maxrate=800:no-chroma-me -vf denoise3d=16:12:48:4,pp=lb -of avi -o %f.avi - -fps %fps +;extpipe x264 - --input-res %wx%h --fps %fps --bitrate 2000 --preset ultrafast --quiet -o %f.mp4 +;extpipe mencoder -demuxer rawvideo -rawvideo w=%w:h=%h:fps=%fps -ovc x264 -x264encopts preset=ultrafast -of lavf -o %f.mp4 - -fps %fps +;extpipe ffmpeg -y -f rawvideo -pix_fmt yuv420p -video_size %wx%h -framerate %fps -i pipe:0 -vcodec libx264 -preset ultrafast -f mp4 %f.mp4 ############################################################ @@ -299,7 +378,7 @@ snapshot_interval 0 # Text Display # %Y = year, %m = month, %d = date, # %H = hour, %M = minute, %S = second, %T = HH:MM:SS, -# %v = event, %q = frame number, %t = thread (camera) number, +# %v = event, %q = frame number, %t = camera id number, # %D = changed pixels, %N = noise level, \n = new line, # %i and %J = width and height of motion area, # %K and %L = X and Y coordinates of motion center @@ -309,9 +388,17 @@ snapshot_interval 0 ############################################################ # Locate and draw a box around the moving object. -# Valid values: on, off and preview (default: off) +# Valid values: on, off, preview (default: off) # Set to 'preview' will only draw a box in preview_shot pictures. -locate off +locate_motion_mode off + +# Set the look and style of the locate box if enabled. +# Valid values: box, redbox, cross, redcross (default: box) +# Set to 'box' will draw the traditional box. +# Set to 'redbox' will draw a red box. +# Set to 'cross' will draw a little cross to mark center. +# Set to 'redcross' will draw a little red cross to mark center. +locate_motion_style box # Draws the timestamp using same options as C function strftime(3) # Default: %Y-%m-%d\n%T = date in ISO format and time in 24 hour clock @@ -340,13 +427,18 @@ text_event %Y%m%d%H%M%S text_double off +# Text to include in a JPEG EXIF comment +# May be any text, including conversion specifiers. +# The EXIF timestamp is included independent of this text. +;exif_text %i%J/%K%L + ############################################################ # Target Directories and filenames For Images And Films -# For the options snapshot_, jpeg_, mpeg_ and timelapse_filename +# For the options snapshot_, picture_, movie_ and timelapse_filename # you can use conversion specifiers # %Y = year, %m = month, %d = date, # %H = hour, %M = minute, %S = second, -# %v = event, %q = frame number, %t = thread (camera) number, +# %v = event, %q = frame number, %t = camera id number, # %D = changed pixels, %N = noise level, # %i and %J = width and height of motion area, # %K and %L = X and Y coordinates of motion center @@ -374,73 +466,90 @@ snapshot_filename %v-%Y%m%d%H%M%S-snapshot # File extension .jpg or .ppm is automatically added so do not include this # Set to 'preview' together with best-preview feature enables special naming # convention for preview shots. See motion guide for details -jpeg_filename %v-%Y%m%d%H%M%S-%q +picture_filename %v-%Y%m%d%H%M%S-%q -# File path for motion triggered ffmpeg films (mpeg) relative to target_dir +# File path for motion triggered ffmpeg films (movies) relative to target_dir # Default: %v-%Y%m%d%H%M%S -# Default value is equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H%M%S -# File extension .mpg or .avi is automatically added so do not include this -# This option was previously called ffmpeg_filename +# File extensions(.mpg .avi) are automatically added so do not include them movie_filename %v-%Y%m%d%H%M%S -# File path for timelapse mpegs relative to target_dir +# File path for timelapse movies relative to target_dir # Default: %Y%m%d-timelapse -# Default value is near equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d-timelapse -# File extension .mpg is automatically added so do not include this +# File extensions(.mpg .avi) are automatically added so do not include them timelapse_filename %Y%m%d-timelapse +############################################################ +# Global Network Options +############################################################ +# Enable IPv6 (default: off) +ipv6_enabled off ############################################################ -# Live Webcam Server +# Live Stream Server ############################################################ # The mini-http server listens to this port for requests (default: 0 = disabled) -webcam_port 2500 +stream_port 2500 -# Quality of the jpeg images produced (default: 50) -webcam_quality 50 +# Quality of the jpeg (in percent) images produced (default: 50) +stream_quality 50 # Output frames at 1 fps when no motion is detected and increase to the -# rate given by webcam_maxrate when motion is detected (default: off) -webcam_motion off +# rate given by stream_maxrate when motion is detected (default: off) +stream_motion off -# Maximum framerate for webcam streams (default: 1) -webcam_maxrate 1 +# Maximum framerate for stream streams (default: 1) +stream_maxrate 1 -# Restrict webcam connections to localhost only (default: on) -webcam_localhost off +# Restrict stream connections to localhost only (default: on) +stream_localhost off # Limits the number of images per connection (default: 0 = unlimited) -# Number can be defined by multiplying actual webcam rate by desired number of seconds -# Actual webcam rate is the smallest of the numbers framerate and webcam_maxrate -webcam_limit 0 +# Number can be defined by multiplying actual stream rate by desired number of seconds +# Actual stream rate is the smallest of the numbers framerate and stream_maxrate +stream_limit 0 +# Set the authentication method (default: 0) +# 0 = disabled +# 1 = Basic authentication +# 2 = MD5 digest (the safer authentication) +stream_auth_method 0 + +# Authentication for the stream. Syntax username:password +# Default: not defined (Disabled) +; stream_authentication username:password + +# Percentage to scale the stream image for preview +# Default: 25 +; stream_preview_scale 25 + +# Have stream preview image start on a new line +# Default: no +; stream_preview_newline no ############################################################ # HTTP Based Control ############################################################ # TCP/IP port for the http server to listen on (default: 0 = disabled) -control_port 0 +webcontrol_port 0 # Restrict control connections to localhost only (default: on) -control_localhost on +webcontrol_localhost on # Output for http server, select off to choose raw text plain (default: on) -control_html_output on +webcontrol_html_output on # Authentication for the http based control. Syntax username:password # Default: not defined (Disabled) -; control_authentication username:password +; webcontrol_authentication username:password ############################################################ # Tracking (Pan/Tilt) -############################################################ +############################################################# -# Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic, 5=uvcvideo) +# Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic, 5=uvcvideo, 6=servo) # The generic type enables the definition of motion center and motion size to # be used with the conversion specifiers for options like on_motion_detected track_type 0 @@ -449,20 +558,38 @@ track_type 0 track_auto off # Serial port of motor (default: none) -; track_port value +;track_port /dev/ttyS0 # Motor number for x-axis (default: 0) track_motorx 0 +# Set motorx reverse (default: 0) +;track_motorx_reverse 0 + # Motor number for y-axis (default: 0) track_motory 0 +# Set motory reverse (default: 0) +;track_motory_reverse 0 + # Maximum value on x-axis (default: 0) track_maxx 0 +# Minimum value on x-axis (default: 0) +;track_minx 50 + # Maximum value on y-axis (default: 0) track_maxy 0 +# Minimum value on y-axis (default: 0) +;track_miny 50 + +# Center value on x-axis (default: 0) +;track_homex 128 + +# Center value on y-axis (default: 0) +;track_homey 128 + # ID of an iomojo camera if used (default: 0) track_iomojo_id 0 @@ -492,7 +619,7 @@ track_stepsize 40 # You can use conversion specifiers for the on_xxxx commands # %Y = year, %m = month, %d = date, # %H = hour, %M = minute, %S = second, -# %v = event, %q = frame number, %t = thread (camera) number, +# %v = event, %q = frame number, %t = camera id number, # %D = changed pixels, %N = noise level, # %i and %J = width and height of motion area, # %K and %L = X and Y coordinates of motion center @@ -509,11 +636,11 @@ track_stepsize 40 quiet on # Command to be executed when an event starts. (default: none) -# An event starts at first motion detected after a period of no motion defined by gap +# An event starts at first motion detected after a period of no motion defined by event_gap ; on_event_start value # Command to be executed when an event ends after a period of no motion -# (default: none). The period of no motion is defined by option gap. +# (default: none). The period of no motion is defined by option event_gap. ; on_event_end value # Command to be executed when a picture (.ppm|.jpg) is saved (default: none) @@ -536,26 +663,26 @@ quiet on ; on_movie_end value # Command to be executed when a camera can't be opened or if it is lost -# NOTE: There is situations when motion doesn't detect a lost camera! -# It depends on the driver, some drivers don't detect a lost camera at all -# Some hang the motion thread. Some even hang the PC! (default: none) +# NOTE: There is situations when motion dones't detect a lost camera! +# It depends on the driver, some drivers dont detect a lost camera at all +# Some hangs the motion thread. Some even hang the PC! (default: none) ; on_camera_lost value -############################################################ -# Common Options For MySQL and PostgreSQL database features. -# Options require the MySQL/PostgreSQL options to be active also. -############################################################ +##################################################################### +# Common Options for database features. +# Options require database options to be active also. +##################################################################### -# Log to the database when creating motion triggered image file (default: on) -sql_log_image on +# Log to the database when creating motion triggered picture file (default: on) +sql_log_picture on # Log to the database when creating a snapshot image file (default: on) sql_log_snapshot on -# Log to the database when creating motion triggered mpeg file (default: off) -sql_log_mpeg off +# Log to the database when creating motion triggered movie file (default: off) +sql_log_movie off -# Log to the database when creating timelapse mpeg file (default: off) +# Log to the database when creating timelapse movies file (default: off) sql_log_timelapse off # SQL query string that is sent to the database @@ -564,45 +691,46 @@ sql_log_timelapse off # %n = the number representing the file_type # %f = filename with full path # Default value: +# Create tables : +## +# Mysql +# CREATE TABLE security (camera int, filename char(80) not null, frame int, file_type int, time_stamp timestamp(14), event_time_stamp timestamp(14)); +# +# Postgresql +# CREATE TABLE security (camera int, filename char(80) not null, frame int, file_type int, time_stamp timestamp without time zone, event_time_stamp timestamp without time zone); +# # insert into security(camera, filename, frame, file_type, time_stamp, text_event) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') ############################################################ -# Database Options For MySQL +# Database Options ############################################################ -# Mysql database to log to (default: not defined) -; mysql_db value - -# The host on which the database is located (default: localhost) -; mysql_host value +# database type : mysql, postgresql, sqlite3 (default : not defined) +; database_type value -# User account name for MySQL database (default: not defined) -; mysql_user value +# database to log to (default: not defined) +# for sqlite3, the full path and name for the database. +; database_dbname value -# User password for MySQL database (default: not defined) -; mysql_password value - - -############################################################ -# Database Options For PostgreSQL -############################################################ +# The host on which the database is located (default: localhost) +; database_host value -# PostgreSQL database to log to (default: not defined) -; pgsql_db value +# User account name for database (default: not defined) +; database_user value -# The host on which the database is located (default: localhost) -; pgsql_host value +# User password for database (default: not defined) +; database_password value -# User account name for PostgreSQL database (default: not defined) -; pgsql_user value +# Port on which the database is located +# mysql 3306 , postgresql 5432 (default: not defined) +; database_port value -# User password for PostgreSQL database (default: not defined) -; pgsql_password value +# Database wait time in milliseconds for locked database to +# be unlocked before returning database locked error (default 0) +; database_busy_timeout 0 -# Port on which the PostgreSQL database is located (default: 5432) -; pgsql_port 5432 ############################################################ @@ -619,19 +747,24 @@ sql_query insert into security(camera, filename, frame, file_type, time_stamp, e ############################################################## -# Thread config files - One for each camera. +# camera config files - One for each camera. # Except if only one camera - You only need this config file. -# If you have more than one camera you MUST define one thread +# If you have more than one camera you MUST define one camera # config file for each camera in addition to this config file. ############################################################## # Remember: If you have more than one camera you must have one -# thread file for each camera. E.g. 2 cameras requires 3 files: -# This motion.conf file AND thread1.conf and thread2.conf. +# camera file for each camera. E.g. 2 cameras requires 3 files: +# This motion.conf file AND camera1.conf and camera2.conf. # Only put the options that are unique to each camera in the -# thread config files. -; thread /usr/local/etc/thread1.conf -; thread /usr/local/etc/thread2.conf -; thread /usr/local/etc/thread3.conf -; thread /usr/local/etc/thread4.conf +# camera config files. +; camera /etc/motion/camera1.conf +; camera /etc/motion/camera2.conf +; camera /etc/motion/camera3.conf +; camera /etc/motion/camera4.conf +############################################################## +# Camera config directory - One for each camera. +############################################################## +# +; camera_dir /etc/motion/conf.d -- 2.11.0

1 0

[PATCH] motion 4.0.1: suggested new rootfile
by Matthias Fischer 27 Mar '17

27 Mar '17

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/motion | 45 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion index aa3e5b78b..82a80973f 100644 --- a/config/rootfiles/packages/motion +++ b/config/rootfiles/packages/motion @@ -1,25 +1,32 @@ -#etc/motion-dist.conf +etc/motion etc/motion.conf +etc/motion/camera1-dist.conf +etc/motion/camera2-dist.conf +etc/motion/camera3-dist.conf +etc/motion/camera4-dist.conf +#etc/motion/motion-dist.conf usr/bin/motion -#usr/share/doc/motion-3.2.12 -#usr/share/doc/motion-3.2.12/CHANGELOG -#usr/share/doc/motion-3.2.12/COPYING -#usr/share/doc/motion-3.2.12/CREDITS -#usr/share/doc/motion-3.2.12/INSTALL -#usr/share/doc/motion-3.2.12/README -#usr/share/doc/motion-3.2.12/motion_guide.html +#usr/share/doc/motion +#usr/share/doc/motion/CHANGELOG +#usr/share/doc/motion/COPYING +#usr/share/doc/motion/CREDITS +#usr/share/doc/motion/README.md +#usr/share/doc/motion/mask1.png +#usr/share/doc/motion/motion_guide.html +#usr/share/doc/motion/normal.jpg +#usr/share/doc/motion/outputmotion1.jpg +#usr/share/doc/motion/outputnormal1.jpg #usr/share/man/man1/motion.1 -#usr/share/motion-3.2.12 -#usr/share/motion-3.2.12/examples -#usr/share/motion-3.2.12/examples/motion-dist.conf -#usr/share/motion-3.2.12/examples/motion.init-Debian -#usr/share/motion-3.2.12/examples/motion.init-Fedora -#usr/share/motion-3.2.12/examples/motion.init-FreeBSD.sh -#usr/share/motion-3.2.12/examples/motion.init-RH -#usr/share/motion-3.2.12/examples/thread1.conf -#usr/share/motion-3.2.12/examples/thread2.conf -#usr/share/motion-3.2.12/examples/thread3.conf -#usr/share/motion-3.2.12/examples/thread4.conf +#usr/share/motion +#usr/share/motion/examples +#usr/share/motion/examples/camera1-dist.conf +#usr/share/motion/examples/camera2-dist.conf +#usr/share/motion/examples/camera3-dist.conf +#usr/share/motion/examples/camera4-dist.conf +#usr/share/motion/examples/motion-dist.conf +#usr/share/motion/examples/motion.init-Debian +#usr/share/motion/examples/motion.init-FreeBSD.sh +#usr/share/motion/examples/motion.service var/ipfire/backup/addons/includes/motion etc/rc.d/init.d/motion etc/rc.d/rc0.d/K01motion -- 2.11.0

1 0

[PATCH] motion: Update to 4.0.1
by Matthias Fischer 25 Mar '17

25 Mar '17

'ffmpeg' seems to need this update. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/motion | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lfs/motion b/lfs/motion index a09133887..d226c1c58 100644 --- a/lfs/motion +++ b/lfs/motion @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2017 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,16 +24,16 @@ include Config -VER = 3.2.12 +VER = 4.0.1 -THISAPP = motion-$(VER) +THISAPP = motion-release-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = motion -PAK_VER = 1 +PAK_VER = 2 DEPS = "ffmpeg" ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ba0065ed50509aaffb171594c689f46 +$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f install : $(TARGET) @@ -81,6 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #Install obsolete V4L1 videodev.h cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h + cd $(DIR_APP) && autoreconf -fiv + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.11.0

1 0

[PATCH] mpd 0.20.6: fixes for lfs-file
by Matthias Fischer 25 Mar '17

25 Mar '17

Package refused to build without initscript. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/mpd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lfs/mpd b/lfs/mpd index cf2862974..3213b27f6 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -77,7 +77,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ --disable-ipv6 \ --sysconfdir=/etc \ --disable-sqlite \ @@ -91,6 +92,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-icu cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + + #install initscripts + $(call INSTALL_INITSCRIPT,mpd) + @rm -rf $(DIR_APP) touch /var/log/mpd.error.log touch /var/log/mpd.log -- 2.11.0

1 0

[PATCH] ntp: Update to 4.2.8p10
by Matthias Fischer 25 Mar '17

25 Mar '17

"It addresses 6 medum- and 5 low-severity security issues, 4 informational security topics, 15 bugfixes, and contains other improvements over 4.2.8p9." For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/ntp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/ntp b/lfs/ntp index 572bb882f..1f1c5244d 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.2.8p9 +VER = 4.2.8p10 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 857452b05f5f2e033786f77ade1974ed +$(DL_FILE)_MD5 = 745384ed0dedb3f66b33fe84d66466f9 install : $(TARGET) -- 2.11.0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2017