Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b736366d6dbabe0ca2b34294115d3a65c6c939cc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b736366d6dbabe0ca2b34294115d3a65c6c939cc)
  • Date: Tue, 30 Aug 2016 23:31:16 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/wpa_supplicant/BUILD | 7 ++++---
net/wpa_supplicant/DETAILS | 2 +-
net/wpa_supplicant/HISTORY | 5 +++++
net/wpa_supplicant/INSTALL | 2 +-
net/wpa_supplicant/PRE_BUILD | 9 +++++----
net/wpa_supplicant/init.d/wpa_supplicant | 2 +-
6 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit b736366d6dbabe0ca2b34294115d3a65c6c939cc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wpa_supplicant: PATCHLEVEL++

commit 62df83abc2c7b3cdc443fe07648d2d29ba177a65
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wpa_supplicant: Install tools to /sbin

commit 38fcb9c84f9d942c494dfc471dd31d677b39cb4c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wpa_supplicant: Use sorcery CFLAGS

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 267dbaa..803e9a7 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -19,13 +19,14 @@ VARS="$VARS CONFIG_TLS" &&

for var in $VARS $OPTS; do
if [[ ${!var} != n ]]; then
- echo "$var=${!var:-y}" >> .config
+ echo "$var=${!var:-y}"
# We ship libnl-3.
if [[ "$var" = CONFIG_DRIVER_NL80211 ]]; then
- echo CONFIG_LIBNL32=y >> .config
+ echo CONFIG_LIBNL32=y
fi
fi
-done &&
+done > .config &&
+echo "CFLAGS += $CFLAGS" >> .config

make &&

diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 571445e..d9372eb 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -13,7 +13,7 @@ else
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_HASH=sha512:e3ca36ed10b4dae8f663e98ad230c8c059c952316c21a6b0638ecb1b40a5ef1b9083138ab45207cb764a17e870b4bd0625dd6efdb65856cb4dca13ccc0559e81
fi
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://w1.fi/releases/$SOURCE
LICENSE[0]=GPL
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 6f1ffaa..918493b 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2016-08-30 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Use sorcery CFLAGS
+ * INSTALL, PRE_BUILD: Install tools to /sbin
+ * DETAILS: PATCHLEVEL++
+
2016-08-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1

diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 562f52f..7332c25 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -1,6 +1,6 @@
cd "$SOURCE_DIRECTORY/wpa_supplicant" &&

-make DESTDIR="$INSTALL_ROOT" install &&
+make DESTDIR="$INSTALL_ROOT" BINDIR=/sbin install &&

install -vm 644 doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8" &&
install -vm 644 doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5" &&
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index b5a4eed..ce619be 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -1,19 +1,20 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $WPA_RELEASE == "stable" ]] && [[ $CONFIG_TLS == "openssl" ]] && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+if [[ $WPA_RELEASE == "stable" ]] && [[ $CONFIG_TLS == "openssl" ]] &&
+ [[ $(get_spell_provider $SPELL SSL) == "libressl" ]]; then
patch -p1 < "$SPELL_DIRECTORY/libressl.patch"
fi &&

-cd "$SOURCE_DIRECTORY/wpa_supplicant" &&
+cd wpa_supplicant &&

sed -i "s|/usr/local|$INSTALL_ROOT/usr|g" Makefile &&

if is_depends_enabled $SPELL dbus; then
if [[ $WPA_RELEASE == legacy ]]; then
- sed -i "s|=/sbin|=$INSTALL_ROOT/usr/sbin|g" dbus-wpa_supplicant.service
+ sed -i "s|=/sbin|=$INSTALL_ROOT/sbin|g" dbus-wpa_supplicant.service
elif [[ $WPA_RELEASE == devel ]]; then
- sed -i "s|=/sbin|=$INSTALL_ROOT/usr/sbin|g" \
+ sed -i "s|=/sbin|=$INSTALL_ROOT/sbin|g" \
dbus/fi.epitest.hostap.WPASupplicant.service
fi
fi &&
diff --git a/net/wpa_supplicant/init.d/wpa_supplicant
b/net/wpa_supplicant/init.d/wpa_supplicant
index 1012147..4f89630 100755
--- a/net/wpa_supplicant/init.d/wpa_supplicant
+++ b/net/wpa_supplicant/init.d/wpa_supplicant
@@ -2,7 +2,7 @@

. /etc/sysconfig/wpa_supplicant

-PROGRAM=/usr/sbin/wpa_supplicant
+PROGRAM=/sbin/wpa_supplicant
RUNLEVEL=3
NEEDS="+network"




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b736366d6dbabe0ca2b34294115d3a65c6c939cc), Ismael Luceno, 08/30/2016

Archive powered by MHonArc 2.6.24.

Top of Page