Changeset 885

Timestamp:

Dec 29, 2016, 10:08:00 AM (2 years ago)

Author:

amain

Message:

debwrt-net: update debwrt-dnsmask.conf and add sshl

Location:

trunk/debian/packages

Files:

• README (modified) (1 diff)
• debwrt-net/trunk/debian/changelog (modified) (1 diff)
• debwrt-net/trunk/debian/postinst (modified) (3 diffs)
• debwrt-net/trunk/debian/rules (modified) (1 diff)
• debwrt-net/trunk/etc/dnsmasq-debwrt.conf (copied) (copied from trunk/debian/packages/debwrt-net/trunk/etc/dnsmasq.d/debwrt.conf)
• debwrt-net/trunk/etc/dnsmasq.d (deleted)
• debwrt-net/trunk/etc/firewall/firewall.sh (modified) (5 diffs)
• debwrt-net/trunk/etc/firewall/sslh.inc.sh (added)
• debwrt-net/trunk/etc/sslh (added)
• debwrt-net/trunk/etc/sslh/sslh.cfg (added)
• debwrt-net/trunk/usr/share/doc/debwrt-net/default (added)
• debwrt-net/trunk/usr/share/doc/debwrt-net/default/sslh (added)
• nvram9/trunk/debian/changelog (modified) (1 diff)

trunk/debian/packages/README

@@ -18 +18 @@
 - lintian -v --show-overrides
 - dput -u <builder-name> <package>.changes 
+
+To cross-compile with sbuild:
+- cd trunk/
+- sbuild --dist stretch-debwrt-unstable \
+         --arch mipsel \
+         --chroot mini-buildd-stretch-mipsel \
+         --chroot-setup-command "apt-get update" \
+         --chroot-setup-command "apt-get --yes --option=APT::Install-Recommends=false install gnupg1" \
+         --build-dep-resolver aptitude \
+         --run-lintian \
+         --lintian-opts --suppress-tags=bad-distribution-in-changes-file \
+         --lintian-opts --info

trunk/debian/packages/debwrt-net/trunk/debian/changelog

@@ +1 @@
+debwrt-net (0.7~debwrtSTRETCH+7) stretch-debwrt-unstable; urgency=medium
+
+  * Fix typo in sslh.cfg
+  * Fix wrongly named DebWrt dnsmasq configuration file
+
+ -- Johan van Zoomeren <amain@debwrt.net>  Sat, 24 Dec 2016 14:36:55 +0100
+
+debwrt-net (0.7~debwrtSTRETCH+6) stretch-debwrt-unstable; urgency=medium
+
+  * Load wl module only for brcm47xx
+
+ -- Johan van Zoomeren <amain@debwrt.net>  Sat, 24 Dec 2016 13:02:36 +0100
+
+debwrt-net (0.7~debwrtSTRETCH+5) stretch-debwrt-unstable; urgency=medium
+
+  * Add sslh support
+
+ -- Johan van Zoomeren <amain@debwrt.net>  Fri, 23 Dec 2016 20:57:24 +0100
+
 debwrt-net (0.7~debwrtSTRETCH+4) stretch-debwrt-unstable; urgency=medium
 

trunk/debian/packages/debwrt-net/trunk/debian/postinst

@@ -5 +5 @@
 # DebWrt - Debian on Embedded devices
 #
-# Copyright (C) 2011,2015 Johan van Zoomeren <amain@debwrt.net>
+# Copyright (C) 2011,2016 Johan van Zoomeren <amain@debwrt.net>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27 +27 @@
 case ${ACTION} in
     configure)
-          cat >>/etc/modules <<EOF
+          if [ "brcm47xx" = "$(cat /lib/modules/debwrt.target &>/dev/null)" ]
+          then
+              if ! grep -q "^[ #]*wl$" /etc/modules
+              then
+                  cat >>/etc/modules <<EOF
 # DebWrt - default is to use the proprietary wl driver for devices with broadcom
 #          wireless chips. There are still performance problems with the open 
@@ -33 +37 @@
 #          commented to use b43.
 #          ( note: also unblacklist b43 in /etc/modprobe.d/b43.conf )
-#wl
+wl
 EOF
+              fi
+          fi
+
+        if [ ! -e /etc/default/sslh.debwrt ]
+        then
+            cp /usr/share/doc/debwrt-net/default/sslh /etc/default/sslh.debwrt
+            mv /etc/default/sslh /etc/default/sslh.org
+            ln -s /etc/default/sslh.debwrt /etc/default/sslh
+
+            # systemd only: disable by default
+            if [ -e /bin/systemctl ]
+            then
+                /bin/systemctl disable sslh
+            fi
+        fi
     ;;
     *)

trunk/debian/packages/debwrt-net/trunk/debian/rules

@@ -8 +8 @@
 
 override_dh_auto_install:
-        install -o root -g root -d $(INSTDIR)/usr/sbin
-        install -o root -g root -d $(INSTDIR)/etc/network
-        install -o root -g root -d $(INSTDIR)/etc/firewall
-        install -o root -g root -d $(INSTDIR)/etc/hostapd
-        install -o root -g root -d $(INSTDIR)/etc/modprobe.d
-        install -o root -g root -d $(INSTDIR)/etc/sysctl.d
-        install -o root -g root -d $(INSTDIR)/etc/dnsmasq.d
-        install -o root -g root -d $(INSTDIR)/usr/share/doc/debwrt-net
-        install -o root -g root -m 755 usr/sbin/pciunbind              $(INSTDIR)/usr/sbin/pciunbind
-        install -o root -g root -m 644 etc/network/interfaces.broadcom $(INSTDIR)/etc/network/interfaces.broadcom
-        install -o root -g root -m 644 etc/network/interfaces.atheros  $(INSTDIR)/etc/network/interfaces.atheros
-        install -o root -g root -m 644 etc/network/interfaces.rspro    $(INSTDIR)/etc/network/interfaces.rspro
-        install -o root -g root -m 644 etc/modprobe.d/wl.conf          $(INSTDIR)/etc/modprobe.d/wl.conf
-        install -o root -g root -m 644 etc/modprobe.d/b43.conf         $(INSTDIR)/etc/modprobe.d/b43.conf
-        install -o root -g root -m 755 etc/firewall/firewall.sh        $(INSTDIR)/etc/firewall/firewall.sh
-        install -o root -g root -m 644 etc/sysctl.d/debwrt.conf        $(INSTDIR)/etc/sysctl.d/debwrt.conf
-        install -o root -g root -m 644 usr/share/doc/debwrt-net/nas    $(INSTDIR)/usr/share/doc/debwrt-net/nas
-        install -o root -g root -m 644 etc/dnsmasq.d/debwrt.conf       $(INSTDIR)/etc/dnsmasq.d/debwrt.conf
-
+        mkdir -p $(INSTDIR)
+        cp -rav --target-directory=$(INSTDIR) etc
+        cp -rav --target-directory=$(INSTDIR) usr
+        chown -R root:root $(INSTDIR)

trunk/debian/packages/debwrt-net/trunk/etc/firewall/firewall.sh

@@ -5 +5 @@
 # Johan van Zoomeren <amain@debwrt.net>
 
+astop=
+astart=
+aflush=
+
 . /lib/lsb/init-functions
+
+# Remove # here and below to enable transparent sslh support
+#. $(dirname ${0})/sslh.inc.sh
 
 IPT=/sbin/iptables
@@ -13 +20 @@
 
     modprobe -a nf_conntrack_ipv4 \
-                xt_state
+                xt_state \
+                xt_multiport \
+                xt_mark
 }
 
@@ -21 +30 @@
     $IPT -t nat    -F
     $IPT -t nat    -X
+
+    for flush in ${aflush}
+    do
+        ${flush}
+    done
 }
 
@@ -27 +41 @@
 
     $IPT -t filter -A INPUT       -m state --state RELATED,ESTABLISHED -i wan -j ACCEPT
+    # sslh on port 443
+    #$IPT -t filter -A INPUT       -p tcp   --dport 443                 -i wan -j ACCEPT
     $IPT -t filter -A INPUT       -i wan -j DROP
 
@@ -34 +50 @@
     #$IPT -t nat    -A POSTROUTING -o wan -j SNAT --to-source "replace: WAN-IF-IP"
     $IPT -t nat    -A POSTROUTING -o wan -j MASQUERADE
+
+    for start in ${astart}
+    do
+        ${start}
+    done
 
     log_action_end_msg 0

trunk/debian/packages/nvram9/trunk/debian/changelog

@@ +1 @@
+nvram9 (0.0-1~debwrtSID+3) sid-debwrt-unstable; urgency=medium
+
+  * mini-buildd, attempt to fix dpkg-genchanges issue during port
+
+ -- Johan van Zoomeren <amain@debwrt.net>  Sat, 03 Dec 2016 22:57:45 +0100
+
 nvram9 (0.0-1~debwrtSID+2) sid-debwrt-unstable; urgency=medium
 
- * Add Conflicts: nvram 
+  * Add Conflicts: nvram 
 
  -- Johan van Zoomeren <amain@debwrt.net>  Sat, 03 Dec 2016 22:57:45 +0100