Merge branch 'master' into f16

Merge branch 'master' into f17
2013-01-30 16:17:02 +01:00 · 2013-01-11 17:36:15 -06:00 · 2012-09-07 00:19:22 +02:00 · 2012-06-28 20:54:12 +02:00 · 2012-06-13 23:29:12 +02:00 · 2012-04-23 13:31:54 +02:00
3 changed files with 10 additions and 68 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,31 +1,3 @@
-wordpress-3.0.1.tar.gz
-/wordpress-3.0.2.tar.gz
-/wordpress-3.0.3.tar.gz
-/wordpress-3.0.4.tar.gz
-/wordpress-3.1.tar.gz
-/wordpress-3.1.1.tar.gz
-/wordpress-3.1.2.tar.gz
-/wordpress-3.1.3.tar.gz
-/wordpress-3.2-RC1.zip
-/wordpress-3.2-RC3.zip
-/wordpress-3.2.tar.gz
-/wordpress-3.2.1.tar.gz
-/wordpress-3.3-beta2.tar.gz
-/wordpress-3.3-beta3.tar.gz
-/wordpress-3.3-beta4.tar.gz
-/wordpress-3.3-RC1.tar.gz
-/wordpress-3.3-RC2.tar.gz
-/wordpress-3.3.tar.gz
-/wordpress-3.3.1.tar.gz
-/wordpress-3.4-beta1.tar.gz
-/wordpress-3.4-beta2.tar.gz
-/wordpress-3.4-beta3.tar.gz
-/wordpress-3.4-beta4.tar.gz
-/wordpress-3.4-RC1.tar.gz
-/wordpress-3.4-RC2.tar.gz
-/wordpress-3.4-RC3.tar.gz
-/wordpress-3.4.tar.gz
-/wordpress-3.4.1.tar.gz
 /wordpress-3.4.2.tar.gz
 /wordpress-3.5-beta-1.tar.gz
 /wordpress-3.5-beta2.tar.gz
--- a/wordpress-FSF-address.patch
+++ b/wordpress-FSF-address.patch
@ -1,12 +0,0 @@
-diff -up wordpress/wp-includes/kses.php.FSFaddr wordpress/wp-includes/kses.php
--- wordpress/wp-includes/kses.php.FSFaddr	2011-05-25 23:54:34.347025847 +0200
-+++ wordpress/wp-includes/kses.php	2011-05-25 23:56:18.403727954 +0200
-@@ -15,7 +15,7 @@
-  *
-  * You should have received a copy of the GNU General Public License along
-  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  or visit
-+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  * http://www.gnu.org/licenses/gpl.html
-  *
-  * [kses strips evil scripts!]
--- a/wordpress.spec
+++ b/wordpress.spec
@ -219,29 +219,14 @@ rm -rf ${RPM_BUILD_ROOT}
  * theme customizer
  * XML-RPC themes and API improvements

-* Tue Jun 12 2012 Matej Cepl <mcepl@redhat.com> - 3.4-0.2.RC3
- They still haven’t released.
+* Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.2-2
+- Security updates for uploading files.
+  * Fixed CVE-2011-0700: two XSS bug. Affects users of the Author
+    or Contributor role.
+  * Fixed CVE-2011-0701: potential information disclosure of
+    posts through the media uploader.

-* Thu Jun 07 2012 Matej Cepl <mcepl@redhat.com> - 3.4-0.2.RC2
- And yet another release candidate.
-
-* Wed May 30 2012 Matej Cepl <mcepl@redhat.com> - 3.4-0.2.RC1
- We have a release candidate now.
-
-* Thu May 03 2012 'Matej Cepl <mcepl@redhat.com>' - 3.4-0.2.beta4
- New week, new upstream beta. Less drama than last time.
-
-* Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.4-0.2.beta3
- And yet another upstream beta (fixes CVE-2011-0700 and
-  CVE-2011-0701)
-
-* Mon Apr 16 2012 Matěj Cepl <mcepl@redhat.com> - 3.4-0.2.beta2
- And yet another upstream beta
-
-* Thu Apr 05 2012 'Matej Cepl <mcepl@redhat.com>' - 3.4-0.1.beta1
- New upstream beta release (just for Rawhide, to be sure we build)
-
-* Wed Jan 04 2012 'Matej Cepl <mcepl@redhat.com>' - 3.3.1-1
+* Wed Jan 04 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.1-1
 - Security (XSS) and maintenance upstream release.

 * Tue Dec 13 2011 'Matěj Cepl <mcepl@redhat.com>' - 3.3-1
@ -274,11 +259,8 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue Jul 05 2011 Matěj Cepl <mcepl@redhat.com> - 3.2-1
 - New upstream release.

-* Wed Jun 29 2011 Matěj Cepl <mcepl@redhat.com> - 3.2-0.1.RC3
- Updated prerelease version (security and minor fixes).
-
-* Sun Jun 19 2011 Matěj Cepl <mcepl@redhat.com> - 3.2-0.1.RC1
- Prerelease version.
+* Wed Jun 29 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.4-1
+- New upstream security release.

 * Thu Jun 02 2011 Matěj Cepl <mcepl@redhat.com> - 3.1.3-3
 - Actually, we just don't need gettext.php at all, it is provided by
Author	SHA1	Message	Date
Remi Collet	0f3ef80387	Merge branch 'master' into f16	2013-01-30 16:17:02 +01:00
Nick Bebout	73d914796c	Merge branch 'master' into f16	2013-01-11 17:36:15 -06:00
Matěj Cepl	6cea378025	Merge branch 'master' into f17 Conflicts: .gitignore sources wordpress.spec	2012-09-07 00:19:22 +02:00
Matěj Cepl	c3a27fde68	New upstream release (minor & security changes)	2012-06-28 20:54:12 +02:00
Matěj Cepl	ef7ca4bf10	New upstream release Conflicts: .gitignore sources wordpress.spec	2012-06-13 23:29:12 +02:00
Matěj Cepl	01a909a7fd	Merge branch 'f17' into f15	2012-04-23 13:31:54 +02:00
Matěj Cepl	2710f1675d	Fix changelog	2012-04-23 12:47:45 +02:00
Matěj Cepl	7b9b4f88a1	New upstream release (security release).	2012-04-23 12:31:57 +02:00
Matěj Cepl	210d5da0de	Merge branch 'master' into f15	2012-01-05 11:41:46 +01:00
Matěj Cepl	a71850787d	Merge branch 'master' into f15	2011-12-13 00:57:38 +01:00
Matěj Cepl	76e9e267b9	Merge branch 'el6' into f14 Conflicts: .gitignore	2011-07-13 02:35:42 +02:00
Matěj Cepl	05844514b7	Merge branch 'master' into f14	2011-07-13 02:32:10 +02:00
Matěj Cepl	38915aef40	Merge branch 'master' into el6	2011-07-13 02:10:56 +02:00
Matěj Cepl	73abfe07ef	Remove FSF address patch	2011-07-13 02:10:39 +02:00
Matěj Cepl	e153eb0f94	Merge branch 'f15' into f14 Conflicts: .gitignore sources wordpress.spec	2011-07-05 11:04:43 +02:00
Matěj Cepl	9f239cfc81	Merge branch 'master' into f14 Conflicts: .gitignore sources wordpress.spec	2011-07-05 11:02:25 +02:00
Matěj Cepl	0bdcec9908	Merge branch 'master' into el6 Conflicts: .gitignore sources wordpress.spec	2011-07-05 03:05:45 +02:00
Matěj Cepl	4214abd909	New upstream release.	2011-06-29 21:35:09 +02:00
Matěj Cepl	ad037120e1	Merge branch 'f13' into f14	2011-06-29 21:33:57 +02:00
Matěj Cepl	73aa093c0f	Actually don't forget to add new sources.	2011-06-29 21:32:43 +02:00
Matěj Cepl	7fff699c89	New upstream release.	2011-06-29 21:30:31 +02:00
Matěj Cepl	e8bc259282	Merge branch 'el6' into f14	2011-06-02 14:40:05 +02:00
Matěj Cepl	a7b92a8414	Merge branch 'el6' into f13	2011-06-02 14:40:00 +02:00
Matěj Cepl	fb63954c33	Merge branch 'master' into f14	2011-06-01 21:01:35 +02:00
Matěj Cepl	622441d177	Merge branch 'master' into f13	2011-06-01 21:01:03 +02:00
Matěj Cepl	6690d558e4	Merge branch 'master' into f14	2011-05-02 16:32:00 +02:00
Matěj Cepl	a94ce28b5e	Merge branch 'master' into f13	2011-05-02 16:26:56 +02:00
Jon Ciesla	d53770ea42	Merge branch 'f14' into f13	2011-03-21 09:34:43 -05:00
Jon Ciesla	ea38f9f434	Spec error.	2011-03-21 09:26:48 -05:00
Jon Ciesla	8c600ef208	Spec error.	2011-03-21 09:25:14 -05:00
Jon Ciesla	95570ae122	Merge branch 'f15' into f14 Conflicts: wordpress-debian_patches_hello.patch wordpress.spec	2011-03-21 09:22:31 -05:00
Jon Ciesla	6ad0713bb3	Merge branch 'f14' into f13	2011-01-11 11:02:00 -06:00
Jon Ciesla	498511599b	Fix for BZ 666782.	2011-01-11 10:55:45 -06:00
Jon Ciesla	f051692f8f	Merge branch 'f14' into f13	2010-12-23 09:07:20 -06:00
Jon Ciesla	8ff4ce2bdf	Multiple fixes.	2010-12-23 09:02:21 -06:00
Fedora Release Engineering	66439e29b8	dist-git conversion	2010-07-29 15:23:41 +00:00
Jesse Keating	9c954c402f	Initialize branch F-13 for wordpress	2010-02-17 03:27:35 +00:00