new upstream release.

etc

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6961 ec354946-7b23-47d6-9f5a-488ba84defc7

h/hostapd/hostapd-vl.spec

@@ -1,67 +1,76 @@
-%define pkg_version 0.7.3
+%define         base_name       hostapd
-%define pkg_release 3%{?_dist_release}
+%define         pkg_version     1.0
-
+%define         pkg_release     1%{?_dist_release}
-Summary:       IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
+
-Name:          hostapd
+Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
-Version:       %{pkg_version}
+Summary(ja):    IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS 認証局
-Release:       %{pkg_release}
+Name:           %{base_name}
-Source0:       %{name}-%{version}.tar.gz
+Version:        %{pkg_version}
-Source1:       %{name}-init.sh
+Release:        %{pkg_release}
-Source2:       %{name}-%{version}.config
+Source0:        %{base_name}-%{version}.tar.gz
-Patch0:        %{name}-%{version}.patch
+Source1:        %{base_name}-init.sh
-License:       GPL2
+Source2:        %{base_name}-%{version}.config
-Group:         System Environment/Daemons
+Patch0:         %{base_name}-%{version}.patch
-URL:           http://hostap.epitest.fi/hostapd/
+Patch100:       %{base_name}-%{version}_CVE-2012-4445.pacth
-
+License:        GPL2
-Requires:      openssl, libnl >= 1.1
+Group:          System Environment/Daemons
-Requires(post): chkconfig
+URL:            http://hostap.epitest.fi/hostapd/
-Requires(preun): chkconfig
+
-BuildRequires: openssl-devel, libnl-devel
+Requires:       openssl, libnl >= 1.1
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Requires(post): %{_syssbindir}/chkconfig
-
+Requires(preun): %{_syssbindir}/chkconfig
-Vendor:        Project Vine
+BuildRequires:  openssl-devel, libnl-devel
-Distribution:  Vine Linux
+BuildRoot:      %{_tmppath}/%{base_name}-%{version}-root
-Packager:      miyabi
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       miyabi
 
 %description
 hostapd is a user space daemon for access point and authentication servers. It implements IEEE 802.11 access point management,
 IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and RADIUS authentication server.
 The current version supports Linux (Host AP, madwifi, mac80211-based drivers) and FreeBSD (net80211).
 
+%description -l ja
+hostapd はアクセスポイントと認証サーバのためのユーザスペースデーモンです。
+IEEE 802.11 アクセスポイント管理、IEEE 802.1X/WPA/WPA2/EAP 認証局、RADIUS クライアント、EAP サーバ、および RADIUS 認証サーバを実装します。
+最新版は、Linux(Host AP、madwifi、mac80211ベースのドライバー)とFreeBSD(net80211)をサポートします。
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
+%patch100 -p1
 cp %{SOURCE1} .
-cp %{SOURCE2} ./%{name}/.config
+cp %{SOURCE2} ./%{base_name}/.config
 
 %build
-cd %{name}
+cd %{base_name}
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
 
-mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
+pushd %{base_name}
-
-pushd %{name}
 %{__make} install DESTDIR="${RPM_BUILD_ROOT}"
 popd
 
-install %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{name}
+mkdir -p ${RPM_BUILD_ROOT}%{_initdir}
+
+install %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{base_name}
 
 %post
-if ! /sbin/chkconfig %{name}; then
+if ! /sbin/chkconfig %{base_name}; then
-  /sbin/chkconfig --add %{name}
+  /sbin/chkconfig --add %{base_name}
 fi
 
-if [ $1 -eq 2 ]; then
+if [ "$1" -eq "2" ]; then
-  %{_initdir}/%{name} condrestart
+  %{_initdir}/%{base_name} condrestart
 fi
 
 %preun
-if [ $1 -eq 0 ]; then
+if [ "$1" -eq "0" ]; then
-  %{_initdir}/%{name} stop
+  %{_initdir}/%{base_name} stop
-  /sbin/chkconfig --del %{name}
+  /sbin/chkconfig --del %{base_name}
 fi
 
 %clean
@@ -69,18 +78,34 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc hostapd/ChangeLog COPYING README
+
-%dir %{_sysconfdir}/hostapd/
+# Directory
-%attr(0755, root, root) %{_sbindir}/hostapd
+%dir %{_sysconfdir}/%{base_name}/
+
+# Program Files
+%attr(0755, root, root) %{_sbindir}/%{base_name}
 %attr(0755, root, root) %{_bindir}/hostapd_cli
-%{_mandir}/man8/hostapd.8.gz
+
+%attr(0755, root, root) %{_initdir}/%{base_name}
+
+# Config Files
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
+
+# Document Files
+%doc %{base_name}/ChangeLog COPYING README
+%{_mandir}/man8/%{base_name}.8.gz
 %{_mandir}/man1/hostapd_cli.1.gz
-%attr(0644, root, root) %config %{_sysconfdir}/hostapd/hostapd.conf
-%attr(0755, root, root) %{_sysconfdir}/rc.d/init.d/hostapd
 
 %changelog
-* Mon Feb 21 2011 Masahiro INOUE <miyabi.-.inoue@nifty.com> 0.7.3-3
+* Fri Oct 19 2012 Masahiro INOUE <miyabi.-.inoue@nifty.com> 1.0.0-1
-- merge spec file
+- new upstream release
+- add Summary(ja)
+- add section - %description -l ja
+- add parameter noreplace to %config
+- change spec file
+
+* Tue Oct  9 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.7.3-3
+- add patch100 for fix CVE-2012-4445 (EPA-TLS message)
 
 * Thu Feb 10 2011 Masahiro INOUE <miyabi.-.inoue@nifty.com> 0.7.3-2
 - fix daemon script