[patch] 0001-Use-upstream-systemd-service-files.patch

0001-Use-upstream-systemd-service-files.patch (text/plain), 5.42 KB, created by Markus Rathgeb on 2014-10-14 22:06:50 UTC

From 66c4d17edb32c05cbc8815e0da6dba0a191d418e Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Wed, 15 Oct 2014 00:04:03 +0200
Subject: [PATCH] Use upstream systemd service files

---
 net-wireless/wpa_supplicant/Manifest                  | 12 +-----------
 net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild |  5 ++---
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 545add0..6febe3b 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX wpa_cli.sh 1407 SHA256 a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179 SHA512 613345f142f2e87f7ebe9eaf3a9a60f4cee08f50596d307bd9c0acd88d1c470080bd27c645455ae32cb4fb7fe96ae131ee09fd6c7657cc298fc3476e4dfdc059 WHIRLPOOL c7d461efcde44f9ce98e99217ef27ef713082269380d1a45da17a9e679c5d816c156cb5c00665034a88680b241144e7e71c901a7c73bae075dfca7eb55b10ffd
 AUX wpa_supplicant-2.0-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
 AUX wpa_supplicant-2.0-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
@@ -24,13 +21,6 @@ DIST wpa_supplicant-2.2.tar.gz 2382570 SHA256 e0d8b8fd68a659636eaba246bb2caacbf5
 DIST wpa_supplicant-2.3.tar.gz 2398722 SHA256 eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a SHA512 dc64c0ff5581ca36e9c41f7663883d5bf6626a4418423233fa69b2c4b57c24fa120e0699c95613152be7775835a45bd9edbe5cc95456ac3ce699b546ddaee71e WHIRLPOOL 015a19f5fcbc144ccf1b695b67aa6d5cf0cd127ed1306808ed94d422224e16978046e4b3cb5edcec46736ddde8926341c8df8f4a5dfa41f52438d6bea3e49e40
 EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90
 EBUILD wpa_supplicant-2.2-r1.ebuild 9088 SHA256 4a4b88507373a245ef76d48cfc874a793d0ef0c3b36ff811fa027150571953fa SHA512 3b380a49a73818cd18a67539c534d8501c20fbd751a2571fce13a558fa81e616c9d168263b4be5161b3f602a15d13422a1ed112da79239a2daa207b71a96cb70 WHIRLPOOL b62c28fc7fcbfa36902fd021f1a24360eb3fcf993aeca733204e5eee514ed5843126bd16cb912321111c37fcfe5bdc769ad38b139b3ddfa01241cf5d5fa833ac
-EBUILD wpa_supplicant-2.3.ebuild 9088 SHA256 1199e0275b23875d119a5fe3102f361b947c5a054332f7e41af65c71d9cb3f54 SHA512 414d38370f062c004fcf7dfbe36f06cc2fbe134e9c86b9be9f0ef9cc8b9ada1a45020d97b8d2b8b58910562d41bb9b72ccbe418ebc42930f556396997ec0bb45 WHIRLPOOL 659aba8167675e90a4023f5ceb256dc762461cc4c6810e495b8035ed02e273383fdea8e3b94402aba7c07b202df40d0a8e9e77833a5a127cf2c49e033e1f4bcf
+EBUILD wpa_supplicant-2.3.ebuild 9003 SHA256 01c789f22879bb9e62b2ae6b5f7d45d13413d469f07fc4d14ecc017901f830b1 SHA512 094cc13b1480f91f649b2573817f4c72b761539a1a23b52d498b0dc0692171b2733bd34764a063588b8e6fb3c6166f792a7b61cfe130c549c1cd6aad5c569b43 WHIRLPOOL 065abe8881dcc79dd59d1e47c7931e7cfc8d67c5690a2d98578866f23ce34c48d4b767e26d8526cab23968336665398a5b73a1a7e2ec7b9845d8b85a999ee5d1
 MISC ChangeLog 45257 SHA256 be6adaecc4ab52862a8e07aba47aa8b2ce646fcc0893b0c186b3a45f9582c3f9 SHA512 0dddba9efc22b8f1ab34a934f6a5125bec5e373487ff61d753f377b22d0623c4b8e051e425ebec3e3582c3025a30f99efa4c1e29bd011b1bd48dd3fcf184324c WHIRLPOOL 940d70024ee9d6f254a1134aa02699d0b052d9596de4d406c2863757825e0c435d2e66414fc43ffcc47de1d91cc5908212e3b2359db789395e665cd962c9ace5
 MISC metadata.xml 1012 SHA256 37d9c37d5abbfa07506679cc02a17074e70d6441607fa7331e91e6698cb661ce SHA512 3253cecb7ccacc69f8bd1d75f89ac951248852bc388957aea4acebd854a70127edb6fa518b71feeeec207912aef599ea5c67e0686f06f26bce6f1489a54f3eed WHIRLPOOL 9b92b86940a039b7be7d7a3ce0c87bf8843d438e5fc0aca3fc103adca8f3ed09a605a4a7db8d4da6d0e87add4c7dcb37258012f8cee45ba427f5771d740e5509
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlQ4K7YACgkQsR7PQhRXYEkz+gCfTSelSjT2mbe76dygVV9iSath
-6u0An163xKKQ68PLKNXXjfIlPGkCDGMQ
-=b5H8
------END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild
index 8dfaa89..4fd3285 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild
@@ -230,7 +230,7 @@ src_configure() {
 
 src_compile() {
 	einfo "Building wpa_supplicant"
-	emake V=1
+	emake V=1 BINDIR=/usr/sbin
 
 	if use wimax; then
 		emake -C ../src/eap_peer clean
@@ -289,8 +289,7 @@ src_install() {
 	fi
 
 	# systemd stuff
-	systemd_dounit "${FILESDIR}"/wpa_supplicant.service
-	systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service'
+	systemd_dounit systemd/*.service
 }
 
 pkg_postinst() {
-- 
2.1.2