Ticket #1222: patch-30040800.txt

Index: configs/freebsd/apache/working/ispcp.conf
===================================================================
--- configs/freebsd/apache/working/ispcp.conf   (revision 1132)
+++ configs/freebsd/apache/working/ispcp.conf   (working copy)
@@ -1,4 +1,41 @@
+# httpd Data BEGIN.
 
 #
-# This file will be replaced by ../httpd.conf when make is executed
+# wget-hack prevention
 #
+
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+    RewriteCond %{HTTP_USER_AGENT} ^LWP::Simple
+    RewriteRule ^/.* http://%{REMOTE_ADDR}/ [L,E=nolog:1]
+</IfModule>
+
+#
+# Web traffic accounting.
+#
+
+LogFormat "%B" traff
+
+#
+# mod_cband configuration
+#
+
+<IfModule mod_cband.c>
+    CBandScoreFlushPeriod 10
+    CBandRandomPulse On
+</IfModule>
+
+#
+# let the customer decide what charset he likes to use
+#
+
+AddDefaultCharset Off
+
+#
+# Header End
+#
+
+# httpd [{IP}] virtual host entry BEGIN.
+# httpd [{IP}] virtual host entry END.
+
+# httpd Data END.
Index: configs/freebsd/apache/00_master.conf
===================================================================
--- configs/freebsd/apache/00_master.conf       (revision 1132)
+++ configs/freebsd/apache/00_master.conf       (working copy)
@@ -70,14 +70,14 @@
 
     <IfModule mod_php4.c>
         <Directory {ROOT_DIR}/gui>
-            php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/bin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}/{OTHER_ROOTKIT_LOG}"
+            php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/sbin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}/{OTHER_ROOTKIT_LOG}"
             php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/"
                        php_admin_value upload_tmp_dir "{ROOT_DIR}/gui/phptmp/"
         </Directory>
     </IfModule>
     <IfModule mod_php5.c>
         <Directory {ROOT_DIR}/gui>
-            php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/bin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}/{OTHER_ROOTKIT_LOG}"
+            php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/sbin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}/{OTHER_ROOTKIT_LOG}"
             php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/"
                        php_admin_value upload_tmp_dir "{ROOT_DIR}/gui/phptmp/"
         </Directory>
Index: configs/freebsd/postfix/main.cf
===================================================================
--- configs/freebsd/postfix/main.cf     (revision 1132)
+++ configs/freebsd/postfix/main.cf     (working copy)
@@ -108,8 +108,8 @@
 # TLS parameters; activate, if avaible/used
 #smtpd_use_tls               = yes
 #smtpd_tls_loglevel          = 2
-#smtpd_tls_cert_file         = /etc/postfix/cert.pem
-#smtpd_tls_key_file          = /etc/postfix/privkey.pem
+#smtpd_tls_cert_file         = /usr/local/etc/postfix/cert.pem
+#smtpd_tls_key_file          = /usr/local/etc/postfix/privkey.pem
 #smtpd_tls_auth_only         = no
 #smtpd_tls_received_header   = yes
 
Index: docs/FreeBSD/INSTALL
===================================================================
--- docs/FreeBSD/INSTALL        (revision 1132)
+++ docs/FreeBSD/INSTALL        (working copy)
@@ -17,7 +17,7 @@
 1) Version Info
 ---------------
 ispCP ω Version         : 1.0.0 RC5
-INSTALL Script         : 3.0
+INSTALL Script         : 3.5
 Maintainer             : 
 Homepage               : http://www.isp-contol.net
 Distros                        : FreeBSD
@@ -52,7 +52,8 @@
 ================================================================================
 4) Installation
 ---------------
-Make sure you are logged in as root and MySQL is running.
+Make sure you are logged in as root and MySQL is running
+and Name Server rndc.key has been setup.
 
 1. Untar or unzip the distribution files to a secure directory:
        # cd /root
@@ -152,7 +153,7 @@
 A.- Please install and configure apache 2.2.x mod_cband package/port
 
 Q.- Can I run ispcp under FreeBSD Jail?
-A.- Yes you can, but you have to modified the daemon to accept connection on jail IP
+A.- Yes you can, but you have to modify the daemon to accept connection on jail IP
 
 Please check http://www.isp-control.net for any questions not answered in this file.
 
Index: docs/FreeBSD/freebsd-packages
===================================================================
--- docs/FreeBSD/freebsd-packages       (revision 1132)
+++ docs/FreeBSD/freebsd-packages       (working copy)
@@ -7,7 +7,7 @@
        + mod_cband     for bandwitdh management
        o mod_php       WARNING: security risk for hosting
        + mod_fastcgi   ( Recomended )
-       + mod_proxy     Req for awstat
+       + mod_proxy     Req for awstats
 Proftpd                        FTP System
        x IPV6          IP v6 support ( but disable by ispcp )
        x mysql         Database module
@@ -17,8 +17,9 @@
        - delay         Not Available in ports
        - ctrls_admin   Not Available in ports
 Postfix                        Email System
+Procmail               Mail filter System
 Bash                   Shell compatibility with Main Version
-courier-imap           IMAP system
+courier-imap           IMAP system, please use version 4.3.x and above
        x userdb        For use with userdb ( ispcp default )
        x mysql         For use with mysql
 courier-pop3           IMAP POP3 system
@@ -57,11 +58,11 @@
        x CLI
        x CGI
        x suhosin
-       x fastcgi
+       + fastcgi
 PHP-Extensions
        x pcre
        x bz2
-       x core
+       x ctype
        x curl
        x dbx
        x domxml
Index: Makefile.fbsd
===================================================================
--- Makefile.fbsd       (revision 1132)
+++ Makefile.fbsd       (working copy)
@@ -37,13 +37,14 @@
 HOST_OS=freebsd
 
 ROOT_CONF=$(INST_PREF)/usr/local/etc
-SYSTEM_ROOT=$(INST_PREF)/usr/local/www/ispcp
+SYSTEM_WEB=/usr/local/www
+SYSTEM_ROOT=$(INST_PREF)$(SYSTEM_WEB)/ispcp
 SYSTEM_CONF=$(INST_PREF)/usr/local/etc/ispcp
 SYSTEM_LOG=$(INST_PREF)/var/log/ispcp
-SYSTEM_APACHE_BACK_LOG=$(INST_PREF)/usr/local/www/logs/backup
-SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/data/virtual
-SYSTEM_AWSTATS=$(INST_PREF)/usr/local/www/awstats
-SYSTEM_FCGI=$(INST_PREF)/usr/local/www/data/fcgi
+SYSTEM_APACHE_BACK_LOG=$(INST_PREF)$(SYSTEM_WEB)/logs/backup
+SYSTEM_VIRTUAL=$(INST_PREF)$(SYSTEM_WEB)/data/virtual
+SYSTEM_AWSTATS=$(INST_PREF)$(SYSTEM_WEB)/awstats
+SYSTEM_FCGI=$(INST_PREF)$(SYSTEM_WEB)/data/fcgi
 SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
 SYSTEM_MAKE_DIRS=/bin/mkdir -p
 SYSTEM_MAKE_FILE=/bin/touch
Index: tools/daemon/lr_syntax.c
===================================================================
--- tools/daemon/lr_syntax.c    (revision 1132)
+++ tools/daemon/lr_syntax.c    (working copy)
@@ -15,6 +15,8 @@
 
 #if !defined(__OpenBSD__) && !defined(__FreeBSD__)
 int readlink(char *pathname, char *buf, int bufsize);
+#else
+int readlink(const char *pathname, char *buf, int bufsize);
 #endif
 
 int lr_syntax(int fd, char *buff)
@@ -24,6 +26,14 @@
 
        time_t tim;
 
+        /*
+         OpenBSD or FreeBSD OLD Routine
+         */
+       #if !defined(__OpenBSD__) && !defined(__FreeBSD__)
+       #else
+       char qcommand [MAX_MSG_SIZE];
+       #endif
+
        ptr = strstr(buff, message(MSG_EQ_CMD));
 
        if (ptr != buff) {
@@ -104,6 +114,22 @@
 
                                execl( daemon_path, "ispcp-rqst-mngr" ,(char*)NULL );
                        }
+                       #else 
+                       /*
+                       OpenBSD or FreeBSD OLD Routine
+                       Temporary HARDCODED
+                        */
+                               memset((void *) &qcommand, '\0', (size_t) sizeof(MAX_MSG_SIZE));
+                               sprintf(qcommand,
+                                                        "%s 1>%s/%s.%ld 2>%s/%s.%ld",
+                                                        "/usr/local/www/ispcp/engine/ispcp-rqst-mngr",
+                                                        LOG_DIR,
+                                                        STDOUT_LOG,
+                                                        (long int) tim,
+                                                        LOG_DIR,
+                                                        STDERR_LOG,
+                                                        (long int) tim);
+                               system(qcommand);
                        #endif
                        exit(0);
                }
Index: tools/daemon/BSDmakefile
===================================================================
--- tools/daemon/BSDmakefile    (revision 1132)
+++ tools/daemon/BSDmakefile    (working copy)
@@ -28,11 +28,11 @@
 #    http://isp-control.net
 #
 
-#ifneq (,$(findstring noopt,$(DAEMON_OPTIONS)))
+#.if eq (,$(findstring noopt,$(DAEMON_OPTIONS)))
+#CFLAGS += -O3
+#.else
 #CFLAGS += -O0
-#else
-CFLAGS += -O3
-#endif
+#.endif
 
 
 OBJS = ispcp_daemon.o message.o daemon_init.o say.o signal-handlers.o\
Index: tools/daemon/helo_syntax.c
===================================================================
--- tools/daemon/helo_syntax.c  (revision 1132)
+++ tools/daemon/helo_syntax.c  (working copy)
@@ -7,6 +7,7 @@
 
        ptr = strstr(buff, message(MSG_HELO_CMD));
 
+/*
        if (ptr != buff || strlen(buff) == 7) {
 
                if (send_line(fd, message(MSG_BAD_SYNTAX), strlen(message(MSG_BAD_SYNTAX))) < 0) {
@@ -16,7 +17,9 @@
                return (1);
 
        } else {
-               char *helo_ans = calloc(MAX_MSG_SIZE, sizeof(char));
+*/
+  
+       char *helo_ans = calloc(MAX_MSG_SIZE, sizeof(char));
 
                ptr = strstr(buff, " ");
 
@@ -32,7 +35,9 @@
                }
 
                free(helo_ans);
+
+/*
        }
-
+*/
        return (NO_ERROR);
 }
Index: BSDmakefile
===================================================================
--- BSDmakefile (revision 1132)
+++ BSDmakefile (working copy)
@@ -30,6 +30,7 @@
 #    http://isp-control.net
 #
 
+
 .ifdef $(OSTYPE)==FreeBSD
 .include <Makefile.fbsd>
 .else
@@ -37,7 +38,9 @@
 .endif
 
 install:
-
+       #
+       # Preparing ISPCP System Directory and files    
+       #
        cd ./tools && $(MAKE) install
        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)
        $(SYSTEM_MAKE_DIRS) $(SYSTEM_ROOT)
@@ -52,13 +55,29 @@
        cd ./gui && $(MAKE) install
        cd ./keys && $(MAKE) install
 
+       #
        # Patch some variable
+       #
        /usr/bin/sed s/"\/etc\/ispcp\/ispcp.conf"/"\/usr\/local\/etc\/ispcp\/ispcp.conf"/g ./engine/ispcp_common_code.pl > $(SYSTEM_ROOT)/engine/ispcp_common_code.pl
-       /usr/bin/sed s/"\/apache\"\;"/"\/apache22\"\;"/g ./engine/setup/ispcp-setup-methods.pl > $(SYSTEM_ROOT)/engine/setup/ispcp-setup-methods.pl
 
+.if exists ($(SYSTEM_WEB)/ispcp/engine/ispcp-db-keys.pl)
+       #
+       # Previous database key detected, assuming being perform Upgrade Procedure
+       #       
+       cp $(SYSTEM_WEB)/ispcp/engine/ispcp-db-keys.pl $(SYSTEM_ROOT)/engine/
+       cp $(SYSTEM_WEB)/ispcp/engine/messager/ispcp-db-keys.pl $(SYSTEM_ROOT)/engine/messager/
+       cp $(SYSTEM_WEB)/ispcp/gui/include/ispcp-db-keys.php $(SYSTEM_ROOT)/gui/include/
+       cp $(SYSTEM_WEB)/ispcp/gui/tools/pma/config.inc.php $(SYSTEM_ROOT)/gui/tools/pma/
+.endif
+
        cd ${INST_PREF} && cp -R * /
        rm -rf ${INST_PREF}
 
+       #
+       #
+       # If Some error occured please read FAQ first and search at forum in http://www.isp-control.net
+       # Go to $(SYSTEM_WEB)/ispcp/engine/setup and type "ispcp-setup" to configure or "ispcp-upgrade" 
+       # to complete upgrade process
 
 uninstall:
 
@@ -79,4 +98,6 @@
 
 clean:
 
-       cd ./tools/daemon && $(MAKE) clean
\ No newline at end of file
+       cd ./tools/daemon && $(MAKE) clean
+
+