Please merge wordpress 2.5.1-4ubuntu1 (universe) from Debian unstable

Jamie: can you please take a look at it?

wordpress (2.5.1-4ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable (LP:#237348), 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.
   - Update maintainer field in debian/control.

 -- Pedro Fragoso <email address hidden> Sun, 15 Jun 2008 05:10:34 +0100

wordpress (2.5.1-4) unstable; urgency=low

  * Added patch to fix unrestricted file upload vulnerability (Closes: #485807)
    Now administrators can upload only files that are in the standard
    mime-type set (Fixes CVE-2008-2392)

 -- Andrea De Iacovo <email address hidden> Sat, 14 Jun 2008 17:31:04 +0200

wordpress (2.5.1-3) unstable; urgency=low

  * rss_language is now modifiable through wp-admin panel.
    Thanks to Lionel Elie Mamane (Closes: #461584)
  * Makes Wordpress depend on tinymce (>= 3.0.7)

 -- Andrea De Iacovo <email address hidden> Mon, 05 May 2008 23:39:35 +0200

I assume that the interdiff is a debdiff against the 2.5.1-4 from unstable, right?

If so, a few comments regarding changelog:
* why is the webroot changed from /var/www to /srv/www? (side note: even if DBTS: 407501 says this change conflicts to FHS, it's imho the right thing, because ... (please fill that into debian/changelog)).
* the change to debian/apache.conf is much bigger than advertised in changelog. Can you add comments what else is done there?

unsubscribing u-u-s, please resubscribe once you've done the changes. Thanks.

Hey Stefan,

I included:

    - debian/apache.conf: Changed to use /var/www instead of /srv/www for
      virtual webroot and add a vhost for blog

To reflect the change that add the vhost and link it in apache.conf

    - debian/README.debian: Updated to include documentation on the change.

Add this missing changelog entrie that explains the use of /srv/www /var/www.

Thanks!

yep, looks good. just doing a testbuild and if it works ok, I'll upload it. Thanks!

sorry, no, doesn't work:

I've copied /usr/share/doc/wordpress/examples/apache.conf to
/etc/apache2/sites-enabled
and tried to reload apache2:

apache2: Syntax error on line 303 of /etc/apache2/apache2.conf: Syntax error on line 53 of /etc/apache2/sites-enabled/apache.conf: </VirtualHost> without matching <VirtualHost> section
   ...fail!

please resubscribe ubuntu-universe-sponsors, once you've fixed this issue or have other comments, thanks!

  Stefan.

I've missed the comment !

Stefan that file isn't for using, it's just an example about various types of vhosts and how to use it in your conf. If i fixed that i would end up fixing every unfinished tag and comment out every comment and if you eventually load the config you would end up with an vhost conflicts

@Pedro: can you try to close Bug #227547 too in this Merge?

Thanks.

This bug was fixed in the package wordpress - 2.5.1-5ubuntu1

---------------
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.

wordpress (2.5.1-5) unstable; urgency=low

  * Modified rules file to have a lintian clean package.

wordpress (2.5.1-4) unstable; urgency=low

  * Added patch to fix unrestricted file upload vulnerability (Closes: #485807)
    Now administrators can upload only files that are in the standard
    mime-type set (Fixes CVE-2008-2392)

wordpress (2.5.1-3) unstable; urgency=low

  * rss_language is now modifiable through wp-admin panel.
    Thanks to Lionel Elie Mamane (Closes: #461584)
  * Makes Wordpress depend on tinymce (>= 3.0.7)

 -- Emanuele Gentili <email address hidden> Wed, 23 Jul 2008 02:25:27 +0200