diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2019-04-22 23:24:12 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2019-04-22 23:24:12 +0200 |
| commit | 9f11219f97c72204bdb935e600e177c3f034c0b4 (patch) | |
| tree | 973d97724e7a1928c6dc1b8818919a034cf6fe2c /wpa_supplicant | |
| parent | 3284da7d37d138e8871128cf2014006471dbe60c (diff) | |
| parent | 41bbc9d550a851d145211db5fcc48358f775716c (diff) | |
| download | opt-9f11219f97c72204bdb935e600e177c3f034c0b4.tar.gz opt-9f11219f97c72204bdb935e600e177c3f034c0b4.tar.xz | |
Merge branch '3.4' into 3.5
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/.signature | 7 | ||||
| -rw-r--r-- | wpa_supplicant/Pkgfile | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/wpa_supplicant/.signature b/wpa_supplicant/.signature index 8ca00df91..2acd260c1 100644 --- a/wpa_supplicant/.signature +++ b/wpa_supplicant/.signature @@ -1,6 +1,13 @@ untrusted comment: verify with /etc/ports/opt.pub +<<<<<<< HEAD RWSE3ohX2g5d/agbrRb7AhRI/5ja+0Ji3dwxxd48tFqlvVotVRQgeJNTq5U9qnE4QB6IqWmkxfB56jMwpKxpHFbrj3N2FQgLEQI= SHA256 (Pkgfile) = c27bfdea6e4861addb6e8db80afe7dec94eab138c9279872666bd6aaa7e57e89 SHA256 (.footprint) = d4302c7846d3447459040f032e05e10dc251113e6a1555b045a4d95aded9e409 SHA256 (wpa_supplicant-2.7.tar.gz) = 76ea6b06b7a2ea8e6d9eb1a9166166f1656e6d48c7508914f592100c95c73074 +======= +RWSE3ohX2g5d/QUO9W3BNqyTY7rsAyY4w5eG5ywn8FLvteSPLjCzWEvUlBsAyDuPTRAA+QzZqHuTU1Lqi/1e9qbselXH8oNIJwM= +SHA256 (Pkgfile) = a42808dcfd9191bddc738f2469a1e11d0a59363636082c79bc40c664b18ea52a +SHA256 (.footprint) = d3b2e0c4068fe789ca0c18c2c81faf906efdbd970fa00641c3e5381dcbc474a5 +SHA256 (wpa_supplicant-2.8.tar.gz) = a689336a12a99151b9de5e25bfccadb88438f4f4438eb8db331cd94346fd3d96 +>>>>>>> 41bbc9d550a851d145211db5fcc48358f775716c SHA256 (wlan) = 62f4c0bf8d5fedcf5b6ad79278f4be16f29841099f385acc4fc91e2d52ca1927 diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index 0f75108b0..ca62098ef 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -4,8 +4,8 @@ # Depends on: openssl readline libnl dbus name=wpa_supplicant -version=2.7 -release=2 +version=2.8 +release=1 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz wlan) |