Ticket #1067: patch-2008022301.txt

File patch-2008022301.txt, 1.5 kB (added by gOOvER, 9 months ago)

Patch from Blocker

Line 
1 --- configs/dists/freebsd/init.d/BSDmakefile.orig       Fri Feb 22 23:18:44 2008
2 +++ configs/dists/freebsd/init.d/BSDmakefile    Fri Feb 22 23:19:08 2008
3 @@ -7,8 +7,8 @@
4         cp ispcp_daemon $(ROOT_CONF)/rc.d/ispcp_daemon.sh
5         cp ispcp_network $(ROOT_CONF)/rc.d/ispcp_network.sh
6  
7 -       chown root:wheel $(ROOT_CONF)/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh
8 -       chmod 0755 $(ROOT_CONF)/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh
9 +       chown root:wheel $(ROOT_CONF)/rc.d/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh
10 +       chmod 0755 $(ROOT_CONF)/rc.d/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh
11  
12  uninstall:
13  
14 --- configs/dists/freebsd/ispcp.conf.orig       Fri Feb 22 23:31:59 2008
15 +++ configs/dists/freebsd/ispcp.conf    Fri Feb 22 23:34:37 2008
16 @@ -16,7 +16,7 @@
17  
18  DEFAULT_ADMIN_ADDRESS =
19  
20 -SERVER_HOSTNAME = debian
21 +SERVER_HOSTNAME = freebsd
22  
23  BASE_SERVER_IP = 127.0.0.1
24  
25 @@ -206,9 +206,9 @@
26  
27  APACHE_SUEXEC_MIN_UID = 2000
28  
29 -APACHE_USER = www-data
30 +APACHE_USER = www
31  
32 -APACHE_GROUP = www-data
33 +APACHE_GROUP = www
34  
35  #
36  # Postfix MTA Data
37 --- tools/daemon/BSDmakefile.orig       Fri Feb 22 23:11:57 2008
38 +++ tools/daemon/BSDmakefile    Fri Feb 22 23:12:45 2008
39 @@ -29,10 +29,9 @@
40  #
41  
42  #ifneq (,$(findstring noopt,$(DAEMON_OPTIONS)))
43 -#      CFLAGS += -O0
44 +#CFLAGS += -O0
45  #else
46 -       CFLAGS += -O3
47 -endif
48 +CFLAGS += -O3
49  #endif
50  
51  
52 --- Makefile.fbsd.orig  Fri Feb 22 23:10:15 2008
53 +++ Makefile.fbsd       Fri Feb 22 23:10:24 2008
54 @@ -1,5 +1,5 @@
55  .ifndef INST_PREF
56 -       INST_PREF=/tmp/ispcp-1.0.0
57 +INST_PREF=/tmp/ispcp-1.0.0
58  .endif
59  
60  HOST_OS=freebsd