extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-26 01:23:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,204 Commits 104 Branches 736 Tags 55 MiB
a67debafb3
Commit Graph

649 Commits

Author SHA1 Message Date
Tom Eastep
a8e9296473 Expunge the g_sbindir variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:55:48 -07:00
Tom Eastep
749e239d15 Expunge the g_libexec variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:51:36 -07:00
Tom Eastep
526ad75c49 Expunge the g_vardir variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-10-01 06:44:52 -07:00
Tom Eastep
ca79147db3 Merge branch '4.5.8' 2012-09-25 11:07:49 -07:00
Tom Eastep
a8f324b25c Ensure that the .service files run the utility in ${SBINDIR} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-24 14:32:20 -07:00
Togan Muftuoglu
58e277f48b Systemd service files usrmove 
On 09/24/2012 10:19 PM, Tom Eastep wrote:
> On 09/24/2012 02:31 AM, Jonathan Underwood wrote:
>> Such a change is something I've been meaning to submit a (trivial) patch
>> for - from a fedora perspective this would be a welcome change.
>
> Okay -- if one of you would send me a patch, I'll apply it. 4.5.8 is
> about to be released, so I would like the patch ASAP if you want it
> included in 4.5.8.

Hope not late and it works, see attached

Togan

>From 3ec45217b6ac93437d002315c56a1b3354160ff2 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Sun, 23 Sep 2012 14:26:07 +0200
Subject: [PATCH] Fix sbin

The service files need to be executed from /usr/sbin not from /sbin

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-24 14:03:55 -07:00
Tom Eastep
8c7b8c9390 Correct missing VARLIB handling in the installers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-10 11:12:43 -07:00
Tom Eastep
2050d566b8 Handle PRODUCT correctly at run-time. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-04 07:36:47 -07:00
Tom Eastep
b922177769 Handle missing VARDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 15:51:35 -07:00
Tom Eastep
e66d9e3418 Rename VARDIR to VARLIB in shorewallrc 
- Done so that existing shorewallrc files are still valid.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-09-02 14:36:11 -07:00
Tom Eastep
f2cecfc33a Merge branch '4.5.7' 2012-08-26 08:15:05 -07:00
Tom Eastep
6392a4514d Clean up white-space in Togan's patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-26 08:14:23 -07:00
Togan Muftuoglu
1a324fa37f Suse specific patches 
Hi Tom,

I have been patching shorewall packages for the opensuse releases, but I
guess it is better to send them to you . the upstream so it gets
incorporated into shorewall itself and I do not have to patch it ;)

I believe I have incorparted most of my patches in to this one. If you
can review them and if appropriate apply them that would be great

Thanks

Togan

>From 6072c08de753e7d1cc31bb758295dee198197e41 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Fri, 24 Aug 2012 13:17:12 +0200
Subject: [PATCH] suse-specific

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:45:57 -07:00
Tom Eastep
b45d15eec6 Revert "Apply Togan Muftuoglu's SuSE-specific init patches" 
This reverts commit 2412998b57.
 2012-08-25 08:45:18 -07:00
Togan Muftuoglu
906795a4d7 Suse specific patches 
Hi Tom,

I have been patching shorewall packages for the opensuse releases, but I
guess it is better to send them to you . the upstream so it gets
incorporated into shorewall itself and I do not have to patch it ;)

I believe I have incorparted most of my patches in to this one. If you
can review them and if appropriate apply them that would be great

Thanks

Togan

>From 6072c08de753e7d1cc31bb758295dee198197e41 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Fri, 24 Aug 2012 13:17:12 +0200
Subject: [PATCH] suse-specific

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:41:28 -07:00
Tom Eastep
519e799ef1 Unify the mode of init files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:59:11 -07:00
Tom Eastep
2412998b57 Apply Togan Muftuoglu's SuSE-specific init patches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:32:30 -07:00
Tom Eastep
1b7a7d0fdf Remove some more hard-coded directory names from the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-17 14:24:52 -07:00
Tom Eastep
691a9bf793 Correct installation on systems with systemd 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-14 14:38:30 -07:00
Tom Eastep
bc2e7487db Fix IPv6 shorecap 
- copied the CLI program initialization steps to shorecap
- Modified install.sh to modify the location of shrorewallrc if needed
 2012-06-05 15:22:08 -07:00
Tom Eastep
9612044933 Make products start automatically at boot on Debian and derivatives 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 11:49:22 -07:00
Tom Eastep
d904a2de86 Search and destroy trailing whitespace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 14:52:57 -07:00
Tom Eastep
5a350d1899 More variable synchronization 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-16 11:40:49 -07:00
Tom Eastep
a32ce5c34a Correct Makefiles 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:01:37 -07:00
Tom Eastep
69a133083c Modify Makefiles for directory relocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-12 10:15:55 -07:00
Tom Eastep
9ba9aad5f7 Reverse relocation of -lite Makefiles in the 4.5.2 branch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-12 07:48:47 -07:00
Tom Eastep
3c09368032 Make changes suggested by Orion Poplawski 
- Change shorewallrc.redhat LIBEXECDIR and PERLLIBDIR settings
- Install -lite Makefiles in ${SHAREDIR}/${PRODUCT}/

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 15:41:21 -07:00
Tom Eastep
58d8ee79f8 Fix -lite installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 11:57:38 -07:00
Tom Eastep
a2abad3f68 Modify getparams to use the installed shorewallrc file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 09:07:07 -07:00
Tom Eastep
334394a5d4 Deprecate the vardir file. 2012-04-05 08:03:31 -07:00
Tom Eastep
38b6dca223 Correct a number of issues with Shorewall-lite 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 07:08:02 -07:00
Tom Eastep
41266627cd Fix secondary CLIs 
- construct the correct pathname for lib.cli
 2012-04-03 08:09:18 -07:00
Tom Eastep
abd864eecb Update copyrights in init scripts that have them 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-03 07:52:39 -07:00
Tom Eastep
fb428bf564 Don't modify CONFDIR and SHAREDIR in the shell code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 12:39:49 -07:00
Tom Eastep
a11e2dd452 Correct uninstall scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 06:48:23 -07:00
Tom Eastep
bb6e17fd3e Many changes involved in getting a relocated installations to work 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-01 10:47:24 -07:00
Tom Eastep
e48e13012c Fix up lib.base during installation 
- Shorewall-core installer creates all necessary directories.
 2012-04-01 08:16:07 -07:00
Tom Eastep
02a68aa436 Look for ./shorewallrc first 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 17:40:18 -07:00
Tom Eastep
d4f93688b5 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 15:25:18 -07:00
Tom Eastep
766370e22a More work on installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 14:42:01 -07:00
Tom Eastep
75b57b926a Revert "Replace lib.base with symbolic link" 
This reverts commit 98f4a1c545.
 2012-03-31 12:57:38 -07:00
Tom Eastep
fead683f18 Modify init scripts if ${SHAREDIR} is non-standard 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:21:37 -07:00
Tom Eastep
98f4a1c545 Replace lib.base with symbolic link 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 15:30:04 -07:00
Tom Eastep
15335f8615 Modify CLIs and libs to know where shorewallrc is. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 12:02:25 -07:00
Tom Eastep
2d841269ee Remove 'local file' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-28 17:01:56 -07:00
Tom Eastep
0d19c99699 Correct default setting of CONFDIR when .shorewallrc is not found 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-28 06:28:53 -07:00
Tom Eastep
c2fa5ae78f Correct typo in install.sh files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 20:19:06 -07:00
Tom Eastep
e1e4855211 Rename USR to PREFIX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 07:47:22 -07:00
Tom Eastep
f2311f1987 Update install scripts to look for .shorewallrc in many places 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 17:01:55 -07:00
Tom Eastep
b31f656d63 Update uninstall scripts for multiple .shorewallrc locations. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 16:19:40 -07:00
Tom Eastep
e641bf7ac2 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 16:01:35 -07:00
Tom Eastep
7b9c1d43cd Look in additional places for .shorewallrc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 15:00:43 -07:00
Tom Eastep
fd82877312 Another fix for init.sh 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:49:49 -07:00
Tom Eastep
2518c653af Modify RedHat/Fedora init scripts for shorewallrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:20:31 -07:00
Tom Eastep
8a18dac870 Installer tweaks 
- Give instructions when Shorewall-core installer finds no rc file
- Update help

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 07:49:52 -07:00
Tom Eastep
eb118e4443 Add shorewallrc files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 13:05:39 -07:00
Tom Eastep
aa503e7211 Apply Tuomo Soini's Makefile patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 10:57:41 -07:00
Tom Eastep
90b33af3bd Fix incorrect manpage 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-25 07:53:05 -08:00
Tom Eastep
37a3dbb6f6 Don't install SysV init script if systemd is specified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 10:59:10 -08:00
Tom Eastep
c252005e25 Add support for packager's config file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 10:07:02 -08:00
Tom Eastep
c975cddfda Correct init script installation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-22 14:51:41 -08:00
Tom Eastep
a6afac0f3c Use standard rpm macros 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-22 13:32:10 -08:00
Tom Eastep
20f990f2eb Fix install on SuSE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 14:24:50 -08:00
Tom Eastep
7de961ebfe Fix broken init scripts. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 13:16:12 -08:00
Tom Eastep
f6cc44eb6b Rename HOST -> TARGET and BUILD -> HOST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 13:00:09 -08:00
Tom Eastep
3acd01a44d Rename some variables: 
HOST -> TARGET
%initdir -> %shorewall_initdir

Also add %shorewall_target

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 12:34:41 -08:00
Tom Eastep
ed9e03b095 Correct FEDORA/REDHAT fiasco 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 16:11:28 -08:00
Tom Eastep
3180e13719 Require LIBEXEC and LIBPERL to be absolute path names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 12:04:00 -08:00
Tom Eastep
9869b4c068 Rename environmental variables: 
INSTALLSYS => BUILD
TARGET     => HOST

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 10:12:52 -08:00
Tom Eastep
8c981e0464 Cleanup of install scripts based on feedback from Mr. Dash4 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 10:08:42 -08:00
Tom Eastep
f8057fed88 Correct typo in the modified install scripts. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:21:50 -08:00
Tom Eastep
ee7ea4adb9 Unify the supported install script os/distro set. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 15:26:02 -08:00
Tom Eastep
33b0821f8d Separate install system from target system in the install.sh scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 13:22:06 -08:00
Tom Eastep
29fcb9b08f Apply Simon Mater's patch for LIBEXEC/PERLLIB 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-13 12:57:07 -08:00
Tom Eastep
1b6c4e3fc4 Update the -lite manpages (long overdue) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-08 13:23:53 -08:00
Tom Eastep
7887def6ad Move manpages directories to their respective product directories 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-05 07:09:27 -08:00
Tom Eastep
aeac7cacb0 Make shorewall-init work again. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-20 09:10:13 -08:00
Tom Eastep
25d45dedfc Add STARTOPTIONS and RESTARTOPTIONS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-16 10:03:13 -08:00
Tom Eastep
93bd0b59a8 Load lib.base from lib.cli 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-14 14:17:06 -08:00
Tom Eastep
847c285e65 Cruft removal 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-04 08:07:45 -08:00
Tom Eastep
ed1ae53c24 Unify install scripts for the -lite products. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-04 07:17:58 -08:00
Tom Eastep
84dc26b82c Create lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-03 13:06:00 -08:00
Tom Eastep
a39f4699dc Update versions and copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-02 07:43:13 -08:00
Tom Eastep
48a59e032e Add Shorewall-common 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-01 20:30:09 -08:00
Tom Eastep
cc78073ce7 Merge lib.cli-lite into lib.cli 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-11 13:15:30 -08:00
Tom Eastep
4cf564e7c9 Move startup_error() to lib.cli, plus cosmetic changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-08 22:00:48 -08:00
Tom Eastep
40f3c48a2c Remove dead code in lib.cli-lite 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-06 19:06:46 -08:00
Tom Eastep
43913915f9 Combine the CLIs into a single 'shorewall' file. 
Add lib.cli-lite and lib.cli-std to contain the functions that are different
between the full products and the lite ones.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-06 12:54:51 -08:00
Tom Eastep
c724e238e6 Move the bulk of command processing to lib.cli 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-06 07:47:34 -08:00
Tom Eastep
e762998f1e Allow spaces in the argument to the iprange command. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-06 06:44:15 -08:00
Tom Eastep
749b893a46 Move lib modification from installation to build 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-04 12:04:03 -08:00
Tom Eastep
e7d2b1d4ed Consolidate the lib.common files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-04 09:19:48 -08:00
Tom Eastep
0d80b54ad9 Correct some issue with file consolidation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-03 13:13:25 -08:00
Tom Eastep
4161c35108 Implement common lib.base, lib.cli and CLI for Shorewall[6][-lite] 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-03 10:59:01 -08:00
Tom Eastep
3110f7c74a Add enable/disable commands to the CLIs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-01 10:25:51 -08:00
Roberto C. Sanchez
cf8c30904d Add support for a "status" command to the Debian init scripts 
(cherry picked from commit d36a2030ea)
 2011-11-06 09:10:59 -05:00
Tom Eastep
bf6ea13898 Update .service files with patch from Jonathan Underwood 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-10-12 06:13:15 -07:00
Tom Eastep
eb5a105d5a Correct Shorewall Lite installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-08-26 11:02:20 -07:00
Tom Eastep
971adc3d5b Add support for serviced in the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-08-23 14:07:44 -07:00
Tom Eastep
33afe26a19 Add Redhat/Fedora init scripts from Jonathan Underwood 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-08-22 09:05:40 -07:00