up to 2.2, new license: Apache 2.0

diff --git a/flashpolicyd-runas-user.patch b/flashpolicyd-runas-user.patch
deleted file mode 100644 (file)
index 9e1c661..0000000
--- a/flashpolicyd-runas-user.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch to make flashpolicyd to run as user nobody/nobody with --user nobody
-argument.
-
---
-Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
-
---- flashpolicyd-2.1/flashpolicyd.rb   2009-10-08 00:11:42.000000000 +0300
-+++ flashpolicyd-2.1/flashpolicyd~     2010-02-09 19:34:24.850284233 +0200
-@@ -60,6 +60,7 @@
-     [ '--verbose', '-v', GetoptLong::NO_ARGUMENT],
-     [ '--timeout', '-t', GetoptLong::OPTIONAL_ARGUMENT],
-     [ '--logfreq', '-l', GetoptLong::OPTIONAL_ARGUMENT],
-+    [ '--user', '-u', GetoptLong::OPTIONAL_ARGUMENT],
-     [ '--logfile', GetoptLong::REQUIRED_ARGUMENT],
-     [ '--help', '-h', GetoptLong::NO_ARGUMENT]
- )
-@@ -71,6 +72,7 @@
- @logfreq = 1800
- xmlfile = ""
- logfile = ""
-+user = ""
- 
- opts.each { |opt, arg|
-   case opt
-@@ -86,6 +88,8 @@
-       exit
-     when '--xml'
-       xmlfile = arg
-+    when '--user'
-+      user = arg
-     when '--verbose'
-       @verbose = true
-     when '--maxclients'
-@@ -393,6 +397,17 @@
-     server = PolicyServer.new(843, "0.0.0.0", @xmldata, @logger, @timeout, @verbose)
-     server.start
- 
-+   # change user after binding to port
-+   if (user.length > 0)
-+        require 'etc'
-+        uid = Etc.getpwnam(user).uid
-+        gid = Etc.getpwnam(user).gid
-+        # Change process ownership
-+        Process.initgroups(user, gid)
-+        Process::GID.change_privilege(gid)
-+        Process::UID.change_privilege(uid)
-+    end
-+
-     # Send HUP to toggle debug mode or not for a running server
-     trap("HUP") {
-       server.toggledebug

diff --git a/flashpolicyd.init b/flashpolicyd.init
old mode 100644 (file)
new mode 100755 (executable)
index 97966c1..0a004d8
--- a/flashpolicyd.init
+++ b/flashpolicyd.init
@@ -9,7 +9,6 @@
 # processname: flashpolicyd
 # config: /etc/flashpolicy.xml
 #
-# $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions

diff --git a/flashpolicyd.spec b/flashpolicyd.spec
index 847ca8b0d6aff89f0d885b09f92205558a619f91..2c76707880ba7057c2f178cea63bc373b8cc70d5 100644 (file)
--- a/flashpolicyd.spec
+++ b/flashpolicyd.spec
@@ -1,15 +1,14 @@
 %define                plugin  check_flashpolicyd
 Summary:       Daemon to serve Adobe Flash socket policy XML
 Name:          flashpolicyd
-Version:       2.1
-Release:       6
-License:       GPL v2
+Version:       2.2
+Release:       1
+License:       ASL 2.0
 Group:         Networking/Daemons
-URL:           http://code.google.com/p/flashpolicyd/
-Source0:       http://flashpolicyd.googlecode.com/files/%{name}-%{version}.tgz
-# Source0-md5: 0ad1ed0b130cf5850d77600fab90a7c2
+Source0:       https://github.com/ripienaar/flashpolicyd/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 0113f5ca4a2b5677da37a0a66d48bc34
 Source1:       %{name}.init
-Patch0:                %{name}-runas-user.patch
+URL:           http://code.google.com/p/flashpolicyd/
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: ruby-modules
 Requires(post,preun):  /sbin/chkconfig
@@ -54,9 +53,6 @@ Nagios plugin to check flashpolicyd.
 
 %prep
 %setup -q
-%patch0 -p1
-# we regenerate rdoc our own
-rm -rf doc
 
 cat > nagios.cfg <<'EOF'
 # Usage:
@@ -82,6 +78,11 @@ EOF
 %build
 rdoc --ri --op ri --title 'Flash Policy Daemon version %{version}' flashpolicyd.rb check_flashpolicyd.rb
 rdoc --op rdoc --title 'Flash Policy Daemon version %{version}' flashpolicyd.rb check_flashpolicyd.rb
+rm ri/Object/cdesc-Object.ri
+rm ri/Object/run_server-i.ri
+rm ri/Object/sec2dhms-i.ri
+rm ri/Object/showhelp-i.ri
+rm ri/cache.ri
 rm ri/created.rid
 
 %install