Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 873

Timestamp:

10/17/07 10:22:25 (11 months ago)

Author:

rats

Message:

* Fixed #783: added Makefile.gentoo
* Fixed #784: ispcp-setup fails with compilation errors
* Fixed #785: bad test into configs/init.d/Makefile

Files:

trunk/CHANGELOG (modified) (2 diffs)
trunk/Makefile.gentoo (added)
trunk/configs/dists/centos/init.d/Makefile (modified) (1 diff)
trunk/configs/dists/fedora/init.d/Makefile (modified) (1 diff)
trunk/configs/dists/gentoo/init.d/Makefile (modified) (1 diff)
trunk/configs/dists/redhat/init.d/Makefile (modified) (2 diffs)
trunk/configs/dists/sles9/cron.d/Makefile (modified) (1 diff)
trunk/configs/dists/sles9/init.d/Makefile (modified) (1 diff)
trunk/configs/dists/suse10/init.d/Makefile (modified) (1 diff)
trunk/configs/dists/ubuntu/init.d/Makefile (modified) (1 diff)
trunk/configs/init.d/Makefile (modified) (1 diff)
trunk/engine/ispcp_common_methods.pl (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r872	r873
7	7	\_________________________________________________________________/
8	8
	9	2007-10-17 Benedikt Heintel
	10	- SETUP:
	11	* Fixed #783: added Makefile.gentoo
	12	* Fixed #784: ispcp-setup fails with compilation errors
	13	* Fixed #785: bad test into configs/init.d/Makefile
	14
9	15	2007-10-16 Raphael Geissert
10		~~- MAKEFILES:~~
11		* Fixed #782: cannot stat `./setup/vhcs2ispcp.pl': No such file or directory
12	16	- ENGINE:
13	17	* Improved entropy pool seeding code
	18	- SETUP:
	19	* Fixed #782: cannot stat `./setup/vhcs2ispcp.pl': No such file or directory
14	20
15	21	2007-10-16 Benedikt Heintel
…	…
20	26	* Fixed #7: Removed static dirs from conf filess
21	27	* Fixed #55: Part I: Update Script from VHCS 2.4.7.1 to ispCP ω 1.0.0
	28	* Fixed #768: perl ispcp-setup - does not work
	29	* Fixed #779: Makefile Error
22	30	* Fixed #781: htdocs folder is empty (on new installed domain)
23		* Fixed #779: Makefile Error
24	31	* Deleted: Old SASL vaiables and use of them
25	32

trunk/configs/dists/centos/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/configs/dists/fedora/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/configs/dists/gentoo/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/configs/dists/redhat/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26
…	…
24	29	rm -f $(ROOT_CONF)/default/ispcp_daemon
25	30	rm -f $(ROOT_CONF)/default/ispcp_network
26

trunk/configs/dists/sles9/cron.d/Makefile

r473	r873
3	3	install:
4	4
5		$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/cron.d
6		cp ./ispcp.phptemp $(ROOT_CONF)/cron.d
7
	5	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
	6	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
	7
	8	cp ispcp_daemon $(ROOT_CONF)/init.d
	9	cp ispcp_network $(ROOT_CONF)/init.d
	10
	11	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	12	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	13
	14	if [[ -f ispcp_daemon.default ]]; then \
	15	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	16	fi
	17	if [[ -f ispcp_network.default ]]; then \
	18	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	19	fi
	20
8	21	uninstall:
9	22
10		rm -rf $(ROOT_CONF)/cron.d
	23	rm -f $(ROOT_CONF)/init.d/ispcp_daemon
	24	rm -f $(ROOT_CONF)/init.d/ispcp_network
	25	rm -f $(ROOT_CONF)/default/ispcp_daemon
	26	rm -f $(ROOT_CONF)/default/ispcp_network

trunk/configs/dists/sles9/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/configs/dists/suse10/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/configs/dists/ubuntu/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if test -f ispcp_daemon.default ; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if test -f ispcp_network.default ; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/configs/init.d/Makefile

r849	r873
9	9	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
10	10	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/default
11
	11
12	12	cp ispcp_daemon $(ROOT_CONF)/init.d
13	13	cp ispcp_network $(ROOT_CONF)/init.d
14		~~[ -f ispcp_daemon.default ] && cp ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon~~
15		~~[ -f ispcp_network.default ] && cp ispcp_network.default $(ROOT_CONF)/default/ispcp_network~~
16	14
17		chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
18		chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon $(ROOT_CONF)/default/ispcp_daemon
19
	15	chown root:root $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	16	chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
	17
	18	if [[ -f ispcp_daemon.default ]]; then \
	19	cp -p ispcp_daemon.default $(ROOT_CONF)/default/ispcp_daemon ; \
	20	fi
	21	if [[ -f ispcp_network.default ]]; then \
	22	cp -p ispcp_network.default $(ROOT_CONF)/default/ispcp_network ; \
	23	fi
	24
20	25	uninstall:
21	26

trunk/engine/ispcp_common_methods.pl

r872	r873
1011	1011	while ($seed >= 0 \|\| int(get_file('/proc/sys/kernel/random/entropy_avail')) <= ($len + 10)) {
1012	1012	save_file('/dev/urandom', rand() * rand());
1013		my $n = 100, $c = undef, $l = 0;
1014		do{$l=int(rand() * 100)); next if($l < 0 \|\| $l > 255);$c .= chr($i}while($n--);
	1013	my ($n, $c, $l) = (100, undef, 0);
	1014	do {
	1015	$l = int(rand() * 100);
	1016	next if ($l < 0 \|\| $l > 255);
	1017	$c .= chr($i);
	1018	} while($n--);
1015	1019	save_file('/dev/urandom', $c);
1016	1020	save_file('/dev/urandom', time ^ ($$ + ($$ << 15)) << (1 ^ rand -$$ ));
…	…
2204	2208	my @domains = @_;
2205	2209	my $len = scalar(@domains);
2206
2207		for (my ($i, $dmn) = (0, ''); $i < $len; $i++) {
	2210	my ($i, $dmn) = (undef, undef);
	2211
	2212	for (($i, $dmn) = (0, ''); $i < $len; $i++) {
2208	2213	$dmn = $domains[$i];
2209	2214	$dmn=join(".",reverse(split(/\./,$dmn)));
…	…
2213	2218	@domains = sort(@domains);
2214	2219
2215		for (my ($i, $dmn) = (0, ''); $i < $len; $i++) {
	2220	for (($i, $dmn) = (0, ''); $i < $len; $i++) {
2216	2221	$dmn = $domains[$i];
2217	2222	$dmn=join(".",reverse(split(/\./,$dmn)));

Development

Navigation

Changeset 873

Legend:

Download in other formats: