OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   06-Aug-2008 09:29:24
  Branch: HEAD                             Handle: 2008080608292300

  Modified files:
    openpkg-src/wordpress   wordpress.patch wordpress.spec

  Log:
    modifying package: wordpress-2.6 20080802 -> 20080806

  Summary:
    Revision    Changes     Path
    1.12        +8  -10     openpkg-src/wordpress/wordpress.patch
    1.80        +3  -3      openpkg-src/wordpress/wordpress.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/wordpress/wordpress.patch
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 wordpress.patch
  --- openpkg-src/wordpress/wordpress.patch     15 Jul 2008 15:48:14 -0000      
1.11
  +++ openpkg-src/wordpress/wordpress.patch     6 Aug 2008 07:29:23 -0000       
1.12
  @@ -1,6 +1,6 @@
   Index: wordpress/wp-includes/canonical.php
   --- wordpress/wp-includes/canonical.php.orig 2008-05-25 17:45:05 +0200
  -+++ wordpress/wp-includes/canonical.php      2008-07-15 17:39:28 +0200
  ++++ wordpress/wp-includes/canonical.php      2008-08-06 09:26:50 +0200
   @@ -144,6 +144,12 @@
        if ( isset($user_home['host']) )
                $redirect['host'] = $user_home['host'];
  @@ -16,7 +16,7 @@
                $redirect['port'] = $user_home['port'];
   Index: wordpress/wp-login.php
   --- wordpress/wp-login.php.orig      2008-07-11 22:14:44 +0200
  -+++ wordpress/wp-login.php   2008-07-15 17:39:28 +0200
  ++++ wordpress/wp-login.php   2008-08-06 09:26:50 +0200
   @@ -138,7 +138,7 @@
                $wpdb->query($wpdb->prepare("UPDATE $wpdb->users SET 
user_activation_key = %s WHERE user_login = %s", $key, $user_login));
        }
  @@ -28,7 +28,7 @@
        $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . 
"\r\n";
   Index: wordpress/wp-mail.php
   --- wordpress/wp-mail.php.orig       2008-05-25 17:50:15 +0200
  -+++ wordpress/wp-mail.php    2008-07-15 17:39:28 +0200
  ++++ wordpress/wp-mail.php    2008-08-06 09:26:50 +0200
   @@ -143,6 +143,7 @@
                // Author not found in DB, set status to pending.  Author 
already set to admin.
                $post_status = 'pending';
  @@ -38,15 +38,13 @@
        $subject = trim($subject);
    
   Index: wp-hashcash/wp-hashcash.php
  ---- wp-hashcash/wp-hashcash.php.orig 2008-03-29 20:07:10 +0100
  -+++ wp-hashcash/wp-hashcash.php      2008-07-15 17:39:28 +0200
  -@@ -448,8 +448,7 @@
  +--- wp-hashcash/wp-hashcash.php.orig 2008-07-30 10:07:02 +0200
  ++++ wp-hashcash/wp-hashcash.php      2008-08-06 09:27:21 +0200
  +@@ -521,7 +521,6 @@
        }
        
  -     echo '<input type="hidden" id="wphc_value" name="wphc_value" 
value=""/>';
  +     echo '<div><input type="hidden" id="wphc_value" name="wphc_value" 
value=""/></div>';
   -    echo '<p>' . __('Powered by', 'wp-hashcash') . ' <a 
href="http://wordpress-plugins.feifei.us/hashcash/";>WP Hashcash</a></p>';
  --    echo '<noscript><small>Wordpress Hashcash needs javascript to work, but 
your browser has javascript disabled. Your comment will be 
'.$verb.'!</small></noscript>';
  -+    echo '<noscript><small>Wordpress Hashcash needs JavaScript to work, but 
your browser has JavaScript disabled. Your comment will be 
'.$verb.'!</small></noscript>';
  +     echo '<noscript><div><small>Wordpress Hashcash needs javascript to 
work, but your browser has javascript disabled. Your comment will be 
'.$verb.'!</small></div></noscript>';
    }
    
  - add_action('comment_form', 'wphc_addform');
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/wordpress/wordpress.spec
  ============================================================================
  $ cvs diff -u -r1.79 -r1.80 wordpress.spec
  --- openpkg-src/wordpress/wordpress.spec      2 Aug 2008 17:07:18 -0000       
1.79
  +++ openpkg-src/wordpress/wordpress.spec      6 Aug 2008 07:29:23 -0000       
1.80
  @@ -33,7 +33,7 @@
   %define       V_plugin_ela           0.10
   %define       V_plugin_stats         1.3.2
   %define       V_plugin_peterantispam 3.0.7
  -%define       V_plugin_hashcash      4.2
  +%define       V_plugin_hashcash      4.3
   
   #   package information
   Name:         wordpress
  @@ -46,7 +46,7 @@
   Group:        CMS
   License:      GPL
   Version:      %{V_wordpress}
  -Release:      20080802
  +Release:      20080806
   
   #   list of sources
   Source0:      http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
  @@ -145,7 +145,7 @@
       }
       prog wordpress:plugin-hashcash = {
           version   = %{V_plugin_hashcash}
  -        url       = http://wordpress-plugins.feifei.us/hashcash/
  +        url       = http://wordpress.org/extend/plugins/wp-hashcash/
           regex     = wp-hashcash\.(__VER__)\.zip
       }
   
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to