rpms/firestarter/devel firestarter-1.0.3-nobrowser.patch, NONE, 1.1 firestarter-1.0.3-services.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 firestarter.spec, 1.15, 1.16 sources, 1.8, 1.9
Michael A. Peters (mpeters)
fedora-extras-commits at redhat.com
Sun Jan 29 05:29:35 UTC 2006
Author: mpeters
Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658
Modified Files:
.cvsignore firestarter.spec sources
Added Files:
firestarter-1.0.3-nobrowser.patch
firestarter-1.0.3-services.patch
Log Message:
fixes bug #178040
I'm not going to request build until bug #160431 is fixed and #179248
has been looked at (and maybe fixed)
firestarter-1.0.3-nobrowser.patch:
--- NEW FILE firestarter-1.0.3-nobrowser.patch ---
diff -ur firestarter-1.0.3/src/menus.c firestarter-1.0.3-patched/src/menus.c
--- firestarter-1.0.3/src/menus.c 2005-01-29 07:32:08.000000000 -0500
+++ firestarter-1.0.3-patched/src/menus.c 2006-01-17 11:12:06.000000000 -0500
@@ -34,8 +34,6 @@
static GtkUIManager *ui_manager;
-static void open_homepage (void);
-static void open_manual (void);
static void copy_selected (void);
/* Normal items */
@@ -67,8 +65,6 @@
{ "EditRule", FIRESTARTER_STOCK_EDIT, N_("_Edit Rule"), NULL, N_("Edit the selected rule"), policyview_edit_rule },
{ "ApplyPolicy", GTK_STOCK_APPLY, N_("A_pply Policy"), NULL, N_("Apply the changes made the policy"), policyview_apply },
- { "OpenManual", GTK_STOCK_HELP, N_("Online Users' _Manual"), NULL, N_("Open the online users' manual in a browser"), open_manual },
- { "OpenHomepage", GTK_STOCK_HOME, N_("Firestarter _Homepage"), NULL, N_("Open the Firestarter homepage in a browser"), open_homepage },
{ "ShowAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL, N_("About Firestarter"), G_CALLBACK (show_about) },
{ "AllowInboundFrom", NULL, N_("Allow Connections From Source"), NULL, N_("Allow all connections from this source"), hitview_allow_host },
@@ -146,8 +142,6 @@
" <menuitem action='ApplyPolicy'/>"
" </menu>"
" <menu action='HelpMenu'>"
- " <menuitem action='OpenManual'/>"
- " <menuitem action='OpenHomepage'/>"
" <separator/>"
" <menuitem action='ShowAbout'/>"
" </menu>"
@@ -538,18 +532,6 @@
g_object_set (G_OBJECT (action), "sensitive", enabled, NULL);
}
-static void
-open_homepage (void)
-{
- gnome_url_show ("http://www.fs-security.com", NULL);
-}
-
-static void
-open_manual (void)
-{
- gnome_url_show ("http://www.fs-security.com/docs/", NULL);
-}
-
/* [ copy_selected ]
* Copy the selection in the active view to the clipboard
*/
firestarter-1.0.3-services.patch:
--- NEW FILE firestarter-1.0.3-services.patch ---
diff -ur firestarter-1.0.3/src/service.c firestarter-1.0.3.patched/src/service.c
--- firestarter-1.0.3/src/service.c 2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3.patched/src/service.c 2006-01-17 04:34:43.000000000 -0800
@@ -22,7 +22,9 @@
} Service;
Service user_services[] = {
+ {"APCUPSD", "3551"},
{"BitTorrent", "6881-6889"},
+ {"CUPS", "631"},
{"DHCP", "67-68"},
{"DNS", "53"},
{"FTP", "20-21"},
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 2 Jun 2005 14:46:10 -0000 1.8
+++ .cvsignore 29 Jan 2006 05:29:35 -0000 1.9
@@ -1 +1,2 @@
firestarter-1.0.3.tar.gz
+20050107-fs-manual.pdf
Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- firestarter.spec 18 Aug 2005 20:07:21 -0000 1.15
+++ firestarter.spec 29 Jan 2006 05:29:35 -0000 1.16
@@ -1,13 +1,17 @@
Name: firestarter
Version: 1.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Firewall tool for GNOME
Group: Applications/Internet
License: GPL
URL: http://firestarter.sourceforge.net
Source0: http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz
+Source1: 20050107-fs-manual.pdf
+#Source1: http://www.fs-security.com/docs/fs-manual.pdf
Patch0: firestarter-1.0.3-pam.patch
+Patch1: firestarter-1.0.3-services.patch
+Patch2: firestarter-1.0.3-nobrowser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -34,7 +38,9 @@
%prep
%setup -q
%patch0 -p1 -b .pam
-
+%patch1 -p1 -b .services
+%patch2 -p1 -b .nobrowser
+cp %{SOURCE1} ./fs-manual.pdf
%build
%configure
@@ -52,7 +58,7 @@
make install DESTDIR=${RPM_BUILD_ROOT}
mv ${RPM_BUILD_ROOT}/%{_bindir}/firestarter ${RPM_BUILD_ROOT}/%{_sbindir}
-ln -s %{_bindir}/consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter
+ln -s consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter
touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/configuration
touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/events-filter-hosts
@@ -115,34 +121,37 @@
%postun
if [ "$1" = "0" ]; then
if [ -e /etc/dhclient-exit-hooks ]; then
- grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > /etc/dhclient-exit-hooks.tmp
- mv /etc/dhclient-exit-hooks.tmp /etc/dhclient-exit-hooks
+ NEW_CONF=`mktemp -t firestarter.XXXXXX`
+ grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
+ cat ${NEW_CONF} > /etc/dhclient-exit-hooks
fi
fi
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc README ChangeLog AUTHORS TODO COPYING CREDITS
+%doc README ChangeLog AUTHORS TODO COPYING CREDITS fs-manual.pdf
%attr(755,root,root) %{_sbindir}/firestarter
%{_bindir}/firestarter
-%config %{_initrddir}/firestarter
+%{_initrddir}/firestarter
%{_sysconfdir}/gconf/schemas/firestarter.schemas
%{_sysconfdir}/pam.d/firestarter
%{_sysconfdir}/security/console.apps/%{name}
%dir %attr(700,root,root) %{_sysconfdir}/firestarter
%dir %attr(700,root,root) %{_sysconfdir}/firestarter/inbound
%dir %attr(700,root,root) %{_sysconfdir}/firestarter/outbound
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports
-%config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/*
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/*
+# ghosted
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports
+%ghost %config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/*
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/*
+# end ghosted
%{_sysconfdir}/firestarter/non-routables
%{_datadir}/applications/fedora-firestarter.desktop
%{_datadir}/pixmaps/*
@@ -150,6 +159,12 @@
%changelog
+* Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-7
+- add CUPS and APCUPSD to services
+- don't open browser window since it runs as root (bug #178040)
+- add PDF documentation
+- some spec file cleanup
+
* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-6
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 2 Jun 2005 14:46:10 -0000 1.8
+++ sources 29 Jan 2006 05:29:35 -0000 1.9
@@ -1 +1,2 @@
f46860a9e16dac4b693bd05f16370b03 firestarter-1.0.3.tar.gz
+61b03e662802b885d5305bd225038010 20050107-fs-manual.pdf
More information about the fedora-extras-commits
mailing list