From: maniacikarus <maniacikarus@ipfire.org>
Date: Fri, 15 May 2009 16:07:28 +0000 (+0200)
Subject: Disabled cryptsetup
X-Git-Tag: v2.5-beta3~19
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f17e1488a1e0001a8ff8586d08718808e56f8d18

Disabled cryptsetup
2nd try to fix updx bug
---

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 8e9fb31ce4..4c4b9c7f3c 100644
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -30,6 +30,7 @@ usr/local/bin/sshctrl
 usr/local/bin/syslogdctrl
 usr/local/bin/timectrl
 #usr/local/bin/tripwirectrl
+usr/local/bin/updxsetperms
 usr/local/bin/upnpctrl
 usr/local/bin/wirelessctrl
 #usr/local/bin/wlanapctrl
diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index b8ecd2010f..cde8b61999 100644
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -37,3 +37,5 @@ srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 usr/local/bin/backupiso
+usr/local/bin/updxsetperms
+var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/packages/cryptsetup b/config/rootfiles/packages/cryptsetup-disabled
similarity index 100%
rename from config/rootfiles/packages/cryptsetup
rename to config/rootfiles/packages/cryptsetup-disabled
diff --git a/config/updxlrator/download b/config/updxlrator/download
index 29548708ca..6744d9c6e9 100644
--- a/config/updxlrator/download
+++ b/config/updxlrator/download
@@ -180,7 +180,7 @@ if ($_ == 0)
 	&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time);
 	&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
 
-	system("/usr/local/bin/squidctrl setperms");
+	system("/usr/local/bin/updxsetperms");
 	system("chmod 775 $repository/$vendorid/$uuid/*");
 
 	unlink ("$repository/download/$vendorid/$updatefile.info");
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 966d732f9c..e9a2712d76 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -74,7 +74,6 @@
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005
-* cryptsetup-1.0.6
 * cups-1.3.9
 * curl-7.19.4
 * cyrus-imapd-2.2.12
diff --git a/make.sh b/make.sh
index 1fb884afd7..8ba3cdbc69 100755
--- a/make.sh
+++ b/make.sh
@@ -595,7 +595,7 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  ipfiremake cryptsetup
+  #ipfiremake cryptsetup
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index 66c8677d2a..d4114a05c3 100755
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -33,15 +33,17 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \
 	redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
 	smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
 	setaliases
+SUID_UPDX = updxsetperms
 
 install : all
 	install -m 755  $(PROGS) /usr/local/bin
 	install -m 4750 -g nobody $(SUID_PROGS) /usr/local/bin
+	install -m 4750 -g squid $(SUID_UPDX) /usr/local/bin
 
-all : $(PROGS) $(SUID_PROGS)
+all : $(PROGS) $(SUID_PROGS) $(SUID_UPDX)
 
 clean : 
-	-rm -f $(PROGS) $(SUID_PROGS) *.o core
+	-rm -f $(PROGS) $(SUID_PROGS) $(SUID_UPDX) *.o core
 
 ######
 
@@ -55,6 +57,8 @@ $(SUID_PROGS): setuid.o
 
 $(PROGS): setuid.o
 
+$(SUID_UPDX): setuid.o
+
 logwatch: logwatch.c setuid.o ../install+setup/libsmooth/varval.o
 	$(COMPILE) -I../install+setup/libsmooth/ logwatch.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 
@@ -148,3 +152,5 @@ wlanapctrl: wlanapctrl.c setuid.o ../install+setup/libsmooth/varval.o
 setaliases: setaliases.c setuid.o ../install+setup/libsmooth/varval.o
 	$(COMPILE) -I../install+setup/libsmooth/ setaliases.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 
+updxsetperms: updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o
+	$(COMPILE) -I../install+setup/libsmooth/ updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o -o $@
diff --git a/src/misc-progs/squidctrl.c b/src/misc-progs/squidctrl.c
index 6493309989..b1b9067319 100644
--- a/src/misc-progs/squidctrl.c
+++ b/src/misc-progs/squidctrl.c
@@ -38,8 +38,6 @@ int main(int argc, char *argv[]) {
 		safe_system("ln -fs ../init.d/squid /etc/rc.d/rc6.d/K00squid >/dev/null 2>&1");
 	} else if (strcmp(argv[1], "disable") == 0) {
 		safe_system("rm -f /etc/rc.d/rc*.d/*squid >/dev/null 2>&1");
-	} else if (strcmp(argv[1], "setperms") == 0) {
-		safe_system("/etc/rc.d/init.d/squid setperms");
 	} else {
 		fprintf(stderr, "\nBad argument given.\n\nsquidctrl (start|stop|restart|flush|reconfigure|setperms)\n\n");
 		exit(1);
diff --git a/src/misc-progs/updxsetperms.c b/src/misc-progs/updxsetperms.c
new file mode 100644
index 0000000000..be7d0e171a
--- /dev/null
+++ b/src/misc-progs/updxsetperms.c
@@ -0,0 +1,28 @@
+/* This file is part of the IPFire Firewall.
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include "setuid.h"
+
+int main(int argc, char *argv[]) {
+
+	if (!(initsetuid()))
+		exit(1);
+
+	if (argc > 1) {
+		fprintf(stderr, "\nNo argument should be given.\n");
+		exit(1);
+	}
+
+	safe_system("/etc/rc.d/init.d/squid setperms");
+	return 0;
+}