diff options
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/config/wpasupplicant/linux | 2 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/hostapd.service | 12 | ||||
| -rw-r--r-- | debian/ifupdown/functions.sh | 6 | ||||
| -rwxr-xr-x | debian/rules | 9 |
6 files changed, 42 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index b3beb65..3aee703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +wpa (2:2.6-6) experimental; urgency=medium + + [ Reiner Herrmann ] + * Port wpa_gui to Qt5 (Closes: #875233). + + [ Andrew Shadura ] + * Add a service file for hostapd. + * Build wpa_supplicant with interface matching support (Closes: #879208). + + [ Benedikt Wildenhain (BO) ] + * Install wpa_supplicant-wired@.service (Closes: #871488). + + [ Jan-Benedict Glaw ] + * Consider all ifupdown configuration, not only /etc/network/interfaces + (Closes: #853293). + + -- Andrew Shadura <andrewsh@debian.org> Fri, 24 Nov 2017 16:00:19 +0000 + wpa (2:2.6-5) experimental; urgency=medium [ Yves-Alexis Perez ] diff --git a/debian/config/wpasupplicant/linux b/debian/config/wpasupplicant/linux index 2224fc3..7cc678a 100644 --- a/debian/config/wpasupplicant/linux +++ b/debian/config/wpasupplicant/linux @@ -458,6 +458,8 @@ CONFIG_WNM=y # Hotspot 2.0 #CONFIG_HS20=y +# Enable interface matching in wpa_supplicant +CONFIG_MATCH_IFACE=y # Disable roaming in wpa_supplicant #CONFIG_NO_ROAMING=y diff --git a/debian/control b/debian/control index c9a4aa0..988ac8b 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Priority: optional Build-Depends: debhelper (>> 9.20120115), libdbus-1-dev, libssl-dev, - libqt4-dev, + qtbase5-dev, libncurses5-dev, libpcsclite-dev, libnl-3-dev [linux-any], @@ -19,7 +19,6 @@ Build-Depends: debhelper (>> 9.20120115), libbsd-dev [kfreebsd-any], libreadline-dev, pkg-config, - qt4-qmake, docbook-to-man, docbook-utils Standards-Version: 3.9.6 @@ -60,7 +59,7 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, wpasupplicant (>= 0.7.3~), - libqt4-svg + libqt5svg5 Recommends: menu Description: graphical user interface for wpa_supplicant wpagui provides a Qt interface for choosing which configured network diff --git a/debian/hostapd.service b/debian/hostapd.service new file mode 100644 index 0000000..90d22f9 --- /dev/null +++ b/debian/hostapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Advanced IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP Authenticator +After=network.target + +[Service] +Type=forking +PIDFile=/run/hostapd.pid +EnvironmentFile=/etc/default/hostapd +ExecStart=/usr/sbin/hostapd -P /run/hostapd.pid -B $DAEMON_OPTS ${DAEMON_CONF} + +[Install] +WantedBy=multi-user.target diff --git a/debian/ifupdown/functions.sh b/debian/ifupdown/functions.sh index 67ac946..3d873a2 100644 --- a/debian/ifupdown/functions.sh +++ b/debian/ifupdown/functions.sh @@ -931,10 +931,8 @@ ifup () { fi if [ -n "$WPA_LOGICAL_IFACE" ]; then - if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then - : # logical network is defined - else - wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE" + if ! /sbin/ifquery "${WPA_LOGICAL_IFACE}" > /dev/null 2/&1; then + wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE and included files." WPA_LOGICAL_IFACE="default" fi diff --git a/debian/rules b/debian/rules index bec85a7..3621f04 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +export QT_SELECT=qt5 export DEB_BUILD_MAINT_OPTIONS=hardening=+all include /usr/share/dpkg/buildflags.mk @@ -32,7 +33,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 's,^Versi ### start dh overrides override_dh_auto_configure: dh_auto_configure --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \ - --buildsystem=qmake_qt4 + --buildsystem=qmake override_dh_auto_build: # build documentation @@ -55,7 +56,7 @@ override_dh_auto_build: --parallel # build wpa_gui-qt4 dh_auto_build --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \ - --buildsystem=qmake_qt4 \ + --buildsystem=qmake \ --parallel dh_auto_clean --sourcedirectory=src --buildsystem=makefile # build hostapd @@ -71,7 +72,7 @@ override_dh_auto_clean: dh_auto_clean --sourcedirectory=wpa_supplicant \ --buildsystem=makefile dh_auto_clean --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \ - --buildsystem=qmake_qt4 + --buildsystem=qmake -find wpa_supplicant/wpa_gui-qt4 -type d -name \.moc -exec rm -rf {} \; -find wpa_supplicant/wpa_gui-qt4 -type d -name \.ui -exec rm -rf {} \; -find wpa_supplicant/wpa_gui-qt4 -type d -name \.obj -exec rm -rf {} \; @@ -95,6 +96,8 @@ override_dh_install: debian/wpasupplicant/lib/systemd/system/wpa_supplicant.service install --mode=644 -D wpa_supplicant/systemd/wpa_supplicant@.service \ debian/wpasupplicant/lib/systemd/system/wpa_supplicant@.service + install --mode=644 -D wpa_supplicant/systemd/wpa_supplicant-wired@.service \ + debian/wpasupplicant/lib/systemd/system/wpa_supplicant-wired@.service # install D-Bus service activation files & configuration install --mode=644 -D wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ debian/wpasupplicant/etc/dbus-1/system.d/wpa_supplicant.conf |