Changeset 885


Ignore:
Timestamp:
Dec 29, 2016, 10:08:00 AM (5 months ago)
Author:
amain
Message:

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

Location:
trunk/debian/packages
Files:
5 added
1 deleted
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/debian/packages/README

    r848 r885  
    1818- lintian -v --show-overrides
    1919- dput -u <builder-name> <package>.changes
     20
     21To cross-compile with sbuild:
     22- cd trunk/
     23- sbuild --dist stretch-debwrt-unstable \
     24         --arch mipsel \
     25         --chroot mini-buildd-stretch-mipsel \
     26         --chroot-setup-command "apt-get update" \
     27         --chroot-setup-command "apt-get --yes --option=APT::Install-Recommends=false install gnupg1" \
     28         --build-dep-resolver aptitude \
     29         --run-lintian \
     30         --lintian-opts --suppress-tags=bad-distribution-in-changes-file \
     31         --lintian-opts --info
  • trunk/debian/packages/debwrt-net/trunk/debian/changelog

    r787 r885  
     1debwrt-net (0.7~debwrtSTRETCH+7) stretch-debwrt-unstable; urgency=medium
     2
     3  * Fix typo in sslh.cfg
     4  * Fix wrongly named DebWrt dnsmasq configuration file
     5
     6 -- Johan van Zoomeren <amain@debwrt.net>  Sat, 24 Dec 2016 14:36:55 +0100
     7
     8debwrt-net (0.7~debwrtSTRETCH+6) stretch-debwrt-unstable; urgency=medium
     9
     10  * Load wl module only for brcm47xx
     11
     12 -- Johan van Zoomeren <amain@debwrt.net>  Sat, 24 Dec 2016 13:02:36 +0100
     13
     14debwrt-net (0.7~debwrtSTRETCH+5) stretch-debwrt-unstable; urgency=medium
     15
     16  * Add sslh support
     17
     18 -- Johan van Zoomeren <amain@debwrt.net>  Fri, 23 Dec 2016 20:57:24 +0100
     19
    120debwrt-net (0.7~debwrtSTRETCH+4) stretch-debwrt-unstable; urgency=medium
    221
  • trunk/debian/packages/debwrt-net/trunk/debian/postinst

    r776 r885  
    55# DebWrt - Debian on Embedded devices
    66#
    7 # Copyright (C) 2011,2015 Johan van Zoomeren <amain@debwrt.net>
     7# Copyright (C) 2011,2016 Johan van Zoomeren <amain@debwrt.net>
    88#
    99# This program is free software: you can redistribute it and/or modify
     
    2727case ${ACTION} in
    2828    configure)
    29           cat >>/etc/modules <<EOF
     29          if [ "brcm47xx" = "$(cat /lib/modules/debwrt.target &>/dev/null)" ]
     30          then
     31              if ! grep -q "^[ #]*wl$" /etc/modules
     32              then
     33                  cat >>/etc/modules <<EOF
    3034# DebWrt - default is to use the proprietary wl driver for devices with broadcom
    3135#          wireless chips. There are still performance problems with the open
     
    3337#          commented to use b43.
    3438#          ( note: also unblacklist b43 in /etc/modprobe.d/b43.conf )
    35 #wl
     39wl
    3640EOF
     41              fi
     42          fi
     43
     44        if [ ! -e /etc/default/sslh.debwrt ]
     45        then
     46            cp /usr/share/doc/debwrt-net/default/sslh /etc/default/sslh.debwrt
     47            mv /etc/default/sslh /etc/default/sslh.org
     48            ln -s /etc/default/sslh.debwrt /etc/default/sslh
     49
     50            # systemd only: disable by default
     51            if [ -e /bin/systemctl ]
     52            then
     53                /bin/systemctl disable sslh
     54            fi
     55        fi
    3756    ;;
    3857    *)
  • trunk/debian/packages/debwrt-net/trunk/debian/rules

    r776 r885  
    88
    99override_dh_auto_install:
    10         install -o root -g root -d $(INSTDIR)/usr/sbin
    11         install -o root -g root -d $(INSTDIR)/etc/network
    12         install -o root -g root -d $(INSTDIR)/etc/firewall
    13         install -o root -g root -d $(INSTDIR)/etc/hostapd
    14         install -o root -g root -d $(INSTDIR)/etc/modprobe.d
    15         install -o root -g root -d $(INSTDIR)/etc/sysctl.d
    16         install -o root -g root -d $(INSTDIR)/etc/dnsmasq.d
    17         install -o root -g root -d $(INSTDIR)/usr/share/doc/debwrt-net
    18         install -o root -g root -m 755 usr/sbin/pciunbind              $(INSTDIR)/usr/sbin/pciunbind
    19         install -o root -g root -m 644 etc/network/interfaces.broadcom $(INSTDIR)/etc/network/interfaces.broadcom
    20         install -o root -g root -m 644 etc/network/interfaces.atheros  $(INSTDIR)/etc/network/interfaces.atheros
    21         install -o root -g root -m 644 etc/network/interfaces.rspro    $(INSTDIR)/etc/network/interfaces.rspro
    22         install -o root -g root -m 644 etc/modprobe.d/wl.conf          $(INSTDIR)/etc/modprobe.d/wl.conf
    23         install -o root -g root -m 644 etc/modprobe.d/b43.conf         $(INSTDIR)/etc/modprobe.d/b43.conf
    24         install -o root -g root -m 755 etc/firewall/firewall.sh        $(INSTDIR)/etc/firewall/firewall.sh
    25         install -o root -g root -m 644 etc/sysctl.d/debwrt.conf        $(INSTDIR)/etc/sysctl.d/debwrt.conf
    26         install -o root -g root -m 644 usr/share/doc/debwrt-net/nas    $(INSTDIR)/usr/share/doc/debwrt-net/nas
    27         install -o root -g root -m 644 etc/dnsmasq.d/debwrt.conf       $(INSTDIR)/etc/dnsmasq.d/debwrt.conf
    28 
     10        mkdir -p $(INSTDIR)
     11        cp -rav --target-directory=$(INSTDIR) etc
     12        cp -rav --target-directory=$(INSTDIR) usr
     13        chown -R root:root $(INSTDIR)
  • trunk/debian/packages/debwrt-net/trunk/etc/firewall/firewall.sh

    r778 r885  
    55# Johan van Zoomeren <amain@debwrt.net>
    66
     7astop=
     8astart=
     9aflush=
     10
    711. /lib/lsb/init-functions
     12
     13# Remove # here and below to enable transparent sslh support
     14#. $(dirname ${0})/sslh.inc.sh
    815
    916IPT=/sbin/iptables
     
    1320
    1421    modprobe -a nf_conntrack_ipv4 \
    15                 xt_state
     22                xt_state \
     23                xt_multiport \
     24                xt_mark
    1625}
    1726
     
    2130    $IPT -t nat    -F
    2231    $IPT -t nat    -X
     32
     33    for flush in ${aflush}
     34    do
     35        ${flush}
     36    done
    2337}
    2438
     
    2741
    2842    $IPT -t filter -A INPUT       -m state --state RELATED,ESTABLISHED -i wan -j ACCEPT
     43    # sslh on port 443
     44    #$IPT -t filter -A INPUT       -p tcp   --dport 443                 -i wan -j ACCEPT
    2945    $IPT -t filter -A INPUT       -i wan -j DROP
    3046
     
    3450    #$IPT -t nat    -A POSTROUTING -o wan -j SNAT --to-source "replace: WAN-IF-IP"
    3551    $IPT -t nat    -A POSTROUTING -o wan -j MASQUERADE
     52
     53    for start in ${astart}
     54    do
     55        ${start}
     56    done
    3657
    3758    log_action_end_msg 0
  • trunk/debian/packages/nvram9/trunk/debian/changelog

    r848 r885  
     1nvram9 (0.0-1~debwrtSID+3) sid-debwrt-unstable; urgency=medium
     2
     3  * mini-buildd, attempt to fix dpkg-genchanges issue during port
     4
     5 -- Johan van Zoomeren <amain@debwrt.net>  Sat, 03 Dec 2016 22:57:45 +0100
     6
    17nvram9 (0.0-1~debwrtSID+2) sid-debwrt-unstable; urgency=medium
    28
    3  * Add Conflicts: nvram
     9  * Add Conflicts: nvram
    410
    511 -- Johan van Zoomeren <amain@debwrt.net>  Sat, 03 Dec 2016 22:57:45 +0100
Note: See TracChangeset for help on using the changeset viewer.