Upgrade xsupplicant to latest stable (1.2.8), fix redeclaration errors (#961)

SVN-Revision: 5664

diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile
index dcbc3441486c35df0bbe5d9df4431684c103e698..9ce8a173f986e79e21320dd5bb9fc8cf6ad17167 100644 (file)
--- a/net/xsupplicant/Makefile
+++ b/net/xsupplicant/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsupplicant
-PKG_VERSION:=1.2.7
+PKG_VERSION:=1.2.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/open1x
-PKG_MD5SUM:=f66c49cd6e4f331d05bf83513ed91990
+PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

diff --git a/net/xsupplicant/patches/003-compile_fix.patch b/net/xsupplicant/patches/003-compile_fix.patch
index 0dde151e82acd8c0cab9b62ee5af43874b6adf7e..33ca70dbb862400da7ca6358937fcb1b602348e3 100644 (file)
--- a/net/xsupplicant/patches/003-compile_fix.patch
+++ b/net/xsupplicant/patches/003-compile_fix.patch
@@ -1,12 +1,12 @@
-diff -ur xsupplicant.old/lib/libxsupgui/Makefile.in xsupplicant.dev/lib/libxsupgui/Makefile.in
---- xsupplicant.old/lib/libxsupgui/Makefile.in 2006-04-16 23:20:42.000000000 +0200
-+++ xsupplicant.dev/lib/libxsupgui/Makefile.in 2006-10-05 14:15:06.009384528 +0200
-@@ -170,7 +170,7 @@
- target_alias = @target_alias@
+diff -urN xsupplicant-1.2.8/lib/libxsupgui/Makefile.in xsupplicant-1.2.8.new/lib/libxsupgui/Makefile.in
+--- xsupplicant-1.2.8/lib/libxsupgui/Makefile.in       2006-10-03 05:02:31.000000000 +0200
++++ xsupplicant-1.2.8.new/lib/libxsupgui/Makefile.in   2006-11-27 22:52:03.000000000 +0100
+@@ -91,7 +91,7 @@
  with_openssl_libs = @with_openssl_libs@
  AUTOMAKE_OPTIONS = foreign no-dependencies
+ 
 -INCLUDES = ${top_srcdir}/src
 +INCLUDES = -I${top_srcdir}/src
+ 
  include_HEADERS = xsupgui.h
  lib_LIBRARIES = libxsupgui.a
- libxsupgui_a_SOURCES = xsupgui.c