diff -Nru wordpress-3.0/debian/apache.conf wordpress-3.0/debian/apache.conf --- wordpress-3.0/debian/apache.conf 2010-06-27 19:19:10.000000000 +0530 +++ wordpress-3.0/debian/apache.conf 2010-06-28 07:01:32.000000000 +0530 @@ -7,18 +7,18 @@ UseCanonicalName Off - VirtualDocumentRoot /srv/www/%0 + VirtualDocumentRoot /var/www/%0 Options All #ServerAdmin admin@example.com - # Store uploads in /srv/www/wp-uploads/$0 + # Store uploads in /var/www/wp-uploads/$0 RewriteEngine On - RewriteRule ^/wp-uploads/(.*)$ /srv/www/wp-uploads/%{HTTP_HOST}/$1 + RewriteRule ^/wp-uploads/(.*)$ /var/www/wp-uploads/%{HTTP_HOST}/$1 And then link the blog to your preferred domain, e.g.: -ln -s /usr/share/wordpress /srv/www/blog.example.com +ln -s /usr/share/wordpress /var/www/blog.example.com For this configuration to work you'll also need to have mod_rewrite and mod_vhost_alias loaded and working in Apache. diff -Nru wordpress-3.0/debian/changelog wordpress-3.0/debian/changelog --- wordpress-3.0/debian/changelog 2010-06-27 19:19:10.000000000 +0530 +++ wordpress-3.0/debian/changelog 2010-06-28 12:50:56.000000000 +0530 @@ -1,3 +1,13 @@ +wordpress (3.0-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: LP: #599256 + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Bhavani Shankar Mon, 28 Jun 2010 12:49:22 +0530 + wordpress (3.0-1) unstable; urgency=low [ Giuseppe Iuculano ] @@ -31,6 +41,16 @@ -- Giuseppe Iuculano Sun, 27 Jun 2010 15:47:40 +0200 +wordpress (2.9.2-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. (LP: #564393) Remaining changes: + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Andreas Wenning Fri, 16 Apr 2010 09:38:21 +0200 + wordpress (2.9.2-1) unstable; urgency=low * [3f228c1] Imported Upstream version 2.9.2 @@ -39,6 +59,16 @@ -- Giuseppe Iuculano Tue, 16 Feb 2010 12:41:01 +0100 +wordpress (2.9.1-2ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Andreas Wenning Wed, 03 Feb 2010 13:40:20 +0100 + wordpress (2.9.1-2) unstable; urgency=low * [4a7279a] Fixed the security id in wp-admin/menu.php (Closes: #561832) - @@ -49,6 +79,16 @@ -- Giuseppe Iuculano Fri, 22 Jan 2010 19:07:14 +0100 +wordpress (2.9.1-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Andreas Wenning Fri, 29 Jan 2010 10:32:10 +0100 + wordpress (2.9.1-1) unstable; urgency=low * [a83b8fd] Imported Upstream version 2.9.1 @@ -67,6 +107,16 @@ -- Giuseppe Iuculano Wed, 23 Dec 2009 14:31:36 +0100 +wordpress (2.8.6-1ubuntu1) lucid; urgency=low + + * Merge from debian testing(LP: #486316). Remaining changes: + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Bhavani Shankar Sat, 28 Nov 2009 11:01:28 +0530 + wordpress (2.8.6-1) unstable; urgency=low * [cf87b24] Updated debian/watch (Closes: #555729) - thanks to Hideki @@ -117,6 +167,16 @@ -- Giuseppe Iuculano Wed, 26 Aug 2009 14:53:43 +0200 +wordpress (2.8.4-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #417322 + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Bhavani Shankar Sat, 22 Aug 2009 16:42:57 +0530 + wordpress (2.8.4-1) unstable; urgency=low * [5f0812d] Imported Upstream version 2.8.4 @@ -152,6 +212,16 @@ -- Giuseppe Iuculano Tue, 18 Aug 2009 08:28:23 +0200 +wordpress (2.8.3-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + + -- Michael Bienia Fri, 14 Aug 2009 13:32:33 +0200 + wordpress (2.8.3-2) unstable; urgency=medium * [2372863] debian/patches/011enforce_activaction_key.dpatch: Enforce @@ -192,6 +262,18 @@ -- Giuseppe Iuculano Tue, 11 Aug 2009 16:30:35 +0200 +wordpress (2.7.1-2ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #327674), Ubuntu remaining changes: + - debian/apache.conf: + + Changed to use /var/www instead of /srv/www for virtual webroot. + - debian/setup-mysql: + + Changed to use /var/www instead of /srv/www. + - debian/patches/010_remove_update_notice.patch: + + Remove Wordpress upgrade notify in admin dashboard + + -- Pedro Fragoso Tue, 17 Feb 2009 01:15:21 +0000 + wordpress (2.7.1-2) unstable; urgency=low * setup-mysql corrected to accept domain names with hyphens (Closes: #514447) @@ -233,6 +315,89 @@ -- Andrea De Iacovo Tue, 23 Oct 2008 17:20:34 +0200 +wordpress (2.5.1-11ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #304323) + + debian/apache.conf: + - Changed to use /var/www instead of /srv/www for virtual webroot. + + debian/setup-mysql: + - Changed to use /var/www instead of /srv/www. + + debian/patches/010_remove_update_notice.patch: + - Reworked original patch to remove Wordpress upgrade notify + in admin dashboard (Rolf Leggewie) (LP: #227547) + + -- Stefan Lesicnik Tue, 02 Dec 2008 11:06:57 +0200 + +wordpress (2.5.1-11) unstable; urgency=high + + * Added 011CVE2008-5278.patch. (Closes: #507193) + Upstream patch for XSS in feed.php self_link function was + implemented. (CVE-2008-5278) + + -- Andrea De Iacovo Sun, 30 Nov 2008 11:26:39 +0100 + +wordpress (2.5.1-10ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #301340) + + debian/apache.conf: + - Changed to use /var/www instead of /srv/www for virtual webroot. + + debian/setup-mysql: + - Changed to use /var/www instead of /srv/www. + * debian/patches/010_remove_update_notice.patch: + - Reworked original patch to remove Wordpress upgrade notify + in admin dashboard (Rolf Leggewie) (LP: #227547) + * Include patch for CVE2008-3747 (LP: #269301) + + -- Stefan Lesicnik Sun, 23 Nov 2008 18:12:33 +0200 + +wordpress (2.5.1-10) unstable; urgency=high + + * 007CVE2008-2392.patch modified. + Now users chan dinamically choose to enable unrestricted upload for admins. + * 010_REQUEST.patch added. + This patch is only a workaround for #504771. Now cookies are properly + checked; if something malicious is found wordpress stops any other execution + until cookies are not cleaned. + + -- Andrea De Iacovo Thu, 06 Nov 2008 10:12:35 +0100 + +wordpress (2.5.1-9ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/apache.conf: + - Changed to use /var/www instead of /srv/www for virtual webroot. + + debian/setup-mysql: + - Changed to use /var/www instead of /srv/www. + - modified to fix permissions on /var/www + + debian/patches/010_remove_update_notice.patch: + - Removed Wordpress upgrade notify in admin dashboard. + + -- Emanuele Gentili Fri, 07 Nov 2008 05:44:33 +0100 + +wordpress (2.5.1-9) unstable; urgency=high + + * Wordpress now depends on libphp-snoopy (Closes: #443948) + * libphp-snoopy dependance solves grave security issue (Closes: #504234) + Thanks to the new version of snoopy class the user input is now sanitized + so it's not possibile to inject malicius code anymore (CVE-2008-4796) + * setup-mysql modified to fix permissions on /srv/www + + -- Andrea De Iacovo Mon, 03 Nov 2008 08:39:16 +0100 + +wordpress (2.5.1-8ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/apache.conf: + - Changed to use /var/www instead of /srv/www for virtual webroot. + + debian/setup-mysql: + - Changed to use /var/www instead of /srv/www. + + debian/patches/010_remove_update_notice.patch: + - Removed Wordpress upgrade notify in admin dashboard. + * Drop debian/patches/008CVE2008-3747.patch as we don't support SSL + in our version we don't need it. (See LP: #269301) + + -- Stefan Ebner Thu, 02 Oct 2008 22:24:20 +0200 + wordpress (2.5.1-8) unstable; urgency=high * Added 009CVE2008-4106 patch. (Closes: #500115) @@ -259,6 +424,26 @@ -- Andrea De Iacovo Sun, 31 Aug 2008 09:02:22 +0200 +wordpress (2.5.1-5ubuntu2) intrepid; urgency=low + + * Change tinymce from 3.0.7 to 3.0.8-1 + + -- Emanuele Gentili Sat, 09 Aug 2008 04:35:43 +0200 + +wordpress (2.5.1-5ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #237348) + + debian/apache.conf: + - Changed to use /var/www instead of /srv/www for virtual webroot. + + debian/setup-mysql: + - Changed to use /var/www instead of /srv/www. + + * other changes: + + debian/patches/008_remove_update_notice.patch: (LP: #227547) + - Removed Wordpress upgrade notify in admin dashboard. + + -- Emanuele Gentili Wed, 23 Jul 2008 02:25:27 +0200 + wordpress (2.5.1-5) unstable; urgency=low * Modified rules file to have a lintian clean package. @@ -281,6 +466,16 @@ -- Andrea De Iacovo Mon, 05 May 2008 23:39:35 +0200 +wordpress (2.5.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: (LP: #226667) + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + - Update maintainer field in debian/control. + + -- Emanuele Gentili Mon, 05 May 2008 00:07:26 +0200 + wordpress (2.5.1-2) unstable; urgency=low * Wordpress provides a MODIFIED tinymce (Closes: #478257) @@ -329,6 +524,17 @@ -- Lionel Elie Mamane Sat, 09 Feb 2008 09:44:24 +0100 +wordpress (2.3.3-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #189481), Ubuntu remaining changes: + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/README.debian: Updated to include documentation on the change. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Emanuele Gentili Wed, 06 Feb 2008 06:14:36 +0100 + wordpress (2.3.3-1) unstable; urgency=high * New upstream security release: @@ -338,6 +544,17 @@ -- Kai Hendry Tue, 05 Feb 2008 16:22:57 +0000 +wordpress (2.3.2+fr-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #187465), Ubuntu remaining changes: + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/README.debian: Updated to include documentation on the change. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Tue, 22 Jan 2008 09:45:59 +0000 + wordpress (2.3.2+fr-1) unstable; urgency=low * Add French language support (Closes: #461617) @@ -350,6 +567,17 @@ -- Lionel Elie Mamane Mon, 21 Jan 2008 23:08:32 +0100 +wordpress (2.3.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #180922), Ubuntu remaining changes: + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/README.debian: Updated to include documentation on the change. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Sun, 06 Jan 2008 21:38:43 +0000 + wordpress (2.3.2-1) unstable; urgency=high * New upstream security release @@ -358,6 +586,18 @@ -- Kai Hendry Sun, 06 Jan 2008 18:12:21 +0000 +wordpress (2.3.1-1ubuntu1) hardy; urgency=low + + * New upstream release. (LP: #138819) + * Merge from debian unstable, remaining changes: + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/README.debian: Updated to include documentation on the change. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + - Update maintainer field in debian/control. + + -- William Grant Wed, 14 Nov 2007 08:50:22 +1100 + wordpress (2.3.1-1) unstable; urgency=high * New upstream security release @@ -387,6 +627,18 @@ -- Kai Hendry Mon, 10 Sep 2007 19:36:34 +0100 +wordpress (2.2.2-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian. + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/README.debian: Updated to include documentation on the change. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + - Update maintainer field in debian/control. + + -- Michele Angrisano Mon, 06 Aug 2007 01:29:18 +0200 + wordpress (2.2.2-1) unstable; urgency=high * New upstream security release @@ -400,6 +652,18 @@ -- Kai Hendry Sun, 05 Aug 2007 09:59:15 +0100 +wordpress (2.2.1-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian. + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot. + - debian/README.debian: Updated to include documentation on the change. + - debian/setup-mysql: Changed to use /var/www instead of /srv/www. + - Update maintainer in field debian/control. + + -- Michele Angrisano Mon, 2 Jul 2007 12:38:17 +0200 + wordpress (2.2.1-1) unstable; urgency=high * New upstream release @@ -411,6 +675,18 @@ -- Kai Hendry Sat, 23 Jun 2007 12:47:10 +0100 +wordpress (2.2-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + - debian/apache.conf: Changed to use /var/www instead of /srv/www for + virtual webroot + - debian/README.debian: Updated to include documentation on the change + - debian/setup-mysql: Changed to use /var/www instead of /srv/www + + -- Kjell Braden Fri, 25 May 2007 15:47:58 +0200 + wordpress (2.2-1) unstable; urgency=low * New upstream release @@ -418,6 +694,18 @@ -- Kai Hendry Wed, 16 May 2007 09:54:36 +0100 +wordpress (2.1.3-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + - debian/apache.conf: Changed to use /var/www instead of /srv/www for virtual webroot + - debian/README.debian: Updated to include documentation on the change + - debian/setup-mysql: Changed to use /var/www instead of /srv/www + * UVF exception: LP: #103396 + + -- Michael Bienia Thu, 5 Apr 2007 22:39:12 +0200 + wordpress (2.1.3-1) unstable; urgency=high * New upstream security release @@ -427,6 +715,25 @@ -- Kai Hendry Wed, 04 Apr 2007 20:35:40 +0100 +wordpress (2.1.2-1ubuntu2) feisty; urgency=low + + * Closes LP: #53001 + - debian/apache.conf: Changed to use /var/www instead of /srv/www for virtual webroot + - debian/README.debian: Updated to include documentation on the change + - debian/setup-mysql: Changed to use /var/www instead of /srv/www + + -- Joseph Jackson IV Sun, 25 Mar 2007 03:16:00 +0500 + +wordpress (2.1.2-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * Fixes CVE-2007-1230 + * UVF exception: LP: #90532 + + -- Michael Bienia Thu, 8 Mar 2007 12:26:41 +0100 + wordpress (2.1.2-1) unstable; urgency=high * New upstream security release @@ -436,6 +743,15 @@ -- Kai Hendry Sun, 4 Mar 2007 20:53:12 +0000 +wordpress (2.1.1-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * UVF exception: LP: #87097 + + -- Michael Bienia Fri, 23 Feb 2007 14:10:37 +0100 + wordpress (2.1.1-1) unstable; urgency=high * New upstream security release @@ -446,6 +762,12 @@ -- Kai Hendry Wed, 21 Feb 2007 11:14:33 +0000 +wordpress (2.1.0-1ubuntu1) feisty; urgency=low + + * Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + + -- Martin Meredith Mon, 5 Feb 2007 15:05:21 +0000 + wordpress (2.1.0-1) unstable; urgency=low * New upstream release + diff -Nru wordpress-3.0/debian/control wordpress-3.0/debian/control --- wordpress-3.0/debian/control 2010-06-27 19:19:10.000000000 +0530 +++ wordpress-3.0/debian/control 2010-06-28 12:49:16.000000000 +0530 @@ -1,7 +1,8 @@ Source: wordpress Section: web Priority: optional -Maintainer: Giuseppe Iuculano +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Giuseppe Iuculano Uploaders: Raphaël Hertzog Standards-Version: 3.8.4 Build-Depends: debhelper (>= 7.0.50~) diff -Nru wordpress-3.0/debian/setup-mysql wordpress-3.0/debian/setup-mysql --- wordpress-3.0/debian/setup-mysql 2010-06-27 19:19:10.000000000 +0530 +++ wordpress-3.0/debian/setup-mysql 2010-06-28 07:01:32.000000000 +0530 @@ -82,16 +82,16 @@ IDENTIFIED BY '$DB_PASSWORD'; FLUSH PRIVILEGES; EOF -[ -d /srv/www ] || mkdir -p /srv/www -ln -s /usr/share/wordpress /srv/www/$DOMAIN +[ -d /var/www ] || mkdir -p /var/www +ln -s /usr/share/wordpress /var/www/$DOMAIN echo Trying to create upload directory: $UPLOAD mkdir -p $UPLOAD echo Setting up permissions -chown -R root:www-data /srv/www/wp-uploads +chown -R root:www-data /var/www/wp-uploads chmod -R 0774 $UPLOAD -chown -R root:www-data /srv/www/$DOMAIN/wp-content -chmod -R 0770 /srv/www/$DOMAIN/wp-content +chown -R root:www-data /var/www/$DOMAIN/wp-content +chmod -R 0770 /var/www/$DOMAIN/wp-content echo Goto http://$DOMAIN to setup Wordpress } @@ -115,7 +115,7 @@ DROP DATABASE IF EXISTS $NAME; EOF rm $CONFIG_FILE -rm -rf /srv/www/$DOMAIN +rm -rf /var/www/$DOMAIN [ -d $UPLOAD ] && echo Please destroy $UPLOAD manually } @@ -152,7 +152,7 @@ fi DOMAIN=$1 -UPLOAD="/srv/www/wp-uploads/$DOMAIN" +UPLOAD="/var/www/wp-uploads/$DOMAIN" if [ $DOMAIN ] ; then ping -c 1 `echo $DOMAIN | sed 's/:[0-9]\+//'` || exit 1