Re: Please accept new typo3 packages into testing
Am Donnerstag, 21. Dezember 2006 15:22 schrieben Sie:
> I'm not really happy to approve this package, there are a lot of changes
> to debian/patches/01-defaults.dpatch which are not document in the
> changelog. Please either remove them or explain them in the changelog of
> a new upload.
I removed these unnecessary changes and let a new version
uploaded by my sponsor.
The new version in testing-proposed-updates is
typo3-dummy_4.0.2-4.dsc
The debdiff output to typo3-dummy_4.0.2-3.dsc is attached.
--
MfG, Christian Welzel
GPG-Key: http://www.camlann.de/key.asc
Fingerprint: 4F50 19BF 3346 36A6 CFA9 DBDC C268 6D24 70A1 AD15
diff -u typo3-dummy-4.0.2/debian/patches/01-defaults.dpatch typo3-dummy-4.0.2/debian/patches/01-defaults.dpatch
--- typo3-dummy-4.0.2/debian/patches/01-defaults.dpatch
+++ typo3-dummy-4.0.2/debian/patches/01-defaults.dpatch
@@ -7,7 +7,7 @@
--- typo3-dummy-4.0.2.orig/typo3conf/localconf.php 2006-09-11 09:18:23.000000000 +0200
+++ typo3-dummy-4.0.2/typo3conf/localconf.php 2006-09-23 18:30:33.072210250 +0200
-@@ -10,4 +10,61 @@
+@@ -10,4 +10,65 @@
## INSTALL SCRIPT EDIT POINT TOKEN - all lines after this points may be changed by the install script!
@@ -15,7 +15,7 @@
\ Kein Zeilenumbruch am Dateiende.
+// If safe_mode is activated with TYPO3, disable use of
+// external programs
-+//$TYPO3_CONF_VARS["BE"]["disable_exec_function"] = '1';
++$TYPO3_CONF_VARS["BE"]["disable_exec_function"] = '1';
+
+// TYPO3 prefers the use of GIF-files and most likely your visitors on
+// your website does too as not all browsers support PNG yet.
@@ -45,6 +45,7 @@
+// Path to the imagemagick manipulation tools like convert,
+// composite and identify
+$TYPO3_CONF_VARS["GFX"]["im_path"] = '/var/lib/typo3-dummy/execdir/';
++$TYPO3_CONF_VARS['GFX']["im_path_lzw"] = '/var/lib/typo3-dummy/execdir/';
+
+// Set Value to 1 if version of ImageMagick is greater than 4.9
+$TYPO3_CONF_VARS["GFX"]["im_version_5"] = '1';
@@ -72,2 +73,5 @@
+
++// set memory limit to 48 mb.
++// You may want to set this limit higher to get the extension manager working.
++$TYPO3_CONF_VARS['SYS']['setMemoryLimit'] = '48';
+?>
diff -u typo3-dummy-4.0.2/debian/apache.conf typo3-dummy-4.0.2/debian/apache.conf
--- typo3-dummy-4.0.2/debian/apache.conf
+++ typo3-dummy-4.0.2/debian/apache.conf
@@ -48,19 +48,28 @@
# enable safe PHP operation
php_admin_value safe_mode on
- php_admin_value safe_mode_include_dir /usr/share/typo3/typo3_src-4.0/
+ php_admin_value safe_mode_gid on
+ # php_admin_value safe_mode_include_dir /usr/share/typo3/typo3_src-4.0/
# Maximum allowed size for uploaded files (PHP defaults to 2MB)
php_admin_value upload_max_filesize 10M
# Maximum amount of memory a script may consume (PHP defaults to 8MB)
- php_admin_value memory_limit 16M
+ # You may want to set this higher as 48 mb if you have problems
+ # getting the extension manager to work.
+ php_admin_value memory_limit 48M
+
+ # Maximum amount of time a script my consume
+ # You may want to set this higher as 30 seconds if you have problems
+ # getting the extension manager to work.
+ # php_admin_value max_execution_time 90
# list of directories where require(), include() and fopen_with_path() look for files
- php_admin_value include_path /var/lib/typo3-dummy/:/usr/share/typo3/typo3_src-4.0/:.
+ php_admin_value include_path /var/lib/typo3-dummy/:/usr/share/typo3/typo3_src-4.0/:.
+ php_admin_value sendmail_path /var/lib/typo3-dummy/execdir/
# Limit the files that can be opened by PHP to the specified directory-tree(s)
- php_admin_value open_basedir /var/lib/typo3-dummy/:/usr/share/typo3/:/usr/share/typo3-dummy/:/etc/typo3-dummy/
+ php_admin_value open_basedir /var/lib/typo3-dummy/:/usr/share/typo3/:/usr/share/typo3-dummy/:/etc/typo3-dummy/:/usr/share/fonts/truetype/ttf-bitstream-vera/
# in safe mode programs that are not in this directory will not be started
php_admin_value safe_mode_exec_dir /var/lib/typo3-dummy/execdir/
@@ -86,6 +95,26 @@
php_value variables_order GPCS
</IfModule>
+ <IfModule mod_php5.c>
+ # for hints regarding these options see section above.
+
+ AddType application/x-httpd-php .php
+ php_admin_value safe_mode on
+ php_admin_value safe_mode_gid on
+ # php_admin_value safe_mode_include_dir /usr/share/typo3/typo3_src-4.0/
+ php_admin_value upload_max_filesize 10M
+ php_admin_value memory_limit 48M
+ # php_admin_value max_execution_time 90
+ php_admin_value include_path /var/lib/typo3-dummy/:/usr/share/typo3/typo3_src-4.0/:.
+ php_admin_value sendmail_path /var/lib/typo3-dummy/execdir/
+ php_admin_value open_basedir /var/lib/typo3-dummy/:/usr/share/typo3/:/etc/typo3-dummy/:/usr/share/fonts/truetype/ttf-bitstream-vera/
+ php_admin_value safe_mode_exec_dir /var/lib/typo3-dummy/execdir/
+ php_flag allow_call_time_pass_reference off
+ php_flag register_globals off
+ php_flag register_argc_argv off
+ php_flag magic_quotes_gpc off
+ php_value variables_order GPCS
+ </IfModule>
</IfModule>
### End: PHP optimisation ###
@@ -111,10 +140,10 @@
# Stop rewrite processing if we are in the typo3/ directory
# For httpd.conf, use this line instead of the next one:
- # RewriteRule ^/TYPO3root/(typo3|typo3temp|typo3conf|t3lib|tslib|fileadmin|uploads|showpic\.php)/ - [L]
- # RewriteRule ^(typo3|typo3temp|typo3conf|t3lib|tslib|fileadmin|uploads|showpic\.php)/ - [L]
- RewriteRule ^/typo3/(typo3|typo3temp|typo3conf|t3lib|tslib|fileadmin|uploads|showpic\.php)/ - [L]
- #RewriteRule ^/typo3-dummy/(typo3|typo3temp|typo3conf|t3lib|tslib|fileadmin|uploads|showpic\.php)/ - [L]
+ # RewriteRule ^/TYPO3root/(typo3|typo3temp|typo3conf|t3lib|fileadmin|uploads)/ - [L]
+ # RewriteRule ^(typo3|typo3temp|typo3conf|t3lib|fileadmin|uploads)/ - [L]
+ RewriteRule ^/typo3/(typo3|typo3temp|typo3conf|t3lib|fileadmin|uploads)/ - [L]
+ #RewriteRule ^/typo3-dummy/(typo3|typo3temp|typo3conf|t3lib|fileadmin|uploads)/ - [L]
# Redirect http://mysite/typo3 to http://mysite/typo3/index_re.php
# and stop the rewrite processing
diff -u typo3-dummy-4.0.2/debian/rules typo3-dummy-4.0.2/debian/rules
--- typo3-dummy-4.0.2/debian/rules
+++ typo3-dummy-4.0.2/debian/rules
@@ -56,6 +56,7 @@
/usr/bin/convert $(DOCROOTDIR)/execdir/convert \
/usr/bin/composite $(DOCROOTDIR)/execdir/composite \
/usr/bin/identify $(DOCROOTDIR)/execdir/identify \
+ /usr/bin/gm $(DOCROOTDIR)/execdir/gm \
/usr/sbin/sendmail $(DOCROOTDIR)/execdir/sendmail
dh_compress
dh_fixperms
diff -u typo3-dummy-4.0.2/debian/changelog typo3-dummy-4.0.2/debian/changelog
--- typo3-dummy-4.0.2/debian/changelog
+++ typo3-dummy-4.0.2/debian/changelog
@@ -1,3 +1,18 @@
+typo3-dummy (4.0.2-4) testing; urgency=medium
+
+ * removed some changes to 01-defaults.dpatch that were forgotten during
+ backport of 4.0.4.
+
+ -- Christian Welzel <gawain@camlann.de> Mon, 20 Dec 2006 21:30:41 +0100
+
+typo3-dummy (4.0.2-3) testing; urgency=medium
+
+ * adjusted apache.conf and localconf.php to work with php4/php5 and safe_mode
+ enabled.
+ * added fix for php memory limit to make the extension manager work again.
+
+ -- Christian Welzel <gawain@camlann.de> Mon, 20 Dec 2006 21:30:41 +0100
+
typo3-dummy (4.0.2-2) unstable; urgency=low
* Removed finding latest version of source by "latest"-link; now hardcoded.
Reply to: