diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8276998..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wordpress-2.6.3.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d36dfea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wordpress-2.8.6.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index b7ae9bc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress -# $Id$ -NAME := wordpress -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 8265a11..4e01de6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3300c2b615861f3bfffdd9701e8dd97 wordpress-2.6.3.tar.gz +1956f09f2abe74ed85e0de04d511d433 wordpress-2.8.6.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 20bdc1a..31788b0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.6.3 +Version: 2.8.6 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -18,9 +18,15 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress -# disable-wordpress-core-update, updates are always installed via rpm -# this does not disable the wordpress-plugins-update check -sed -i -e "s,^add_action,#add_action,g" wp-includes/update.php +# disable wp_version_check, updates are always installed via rpm +sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \ + wp-includes/update.php +# disable update_nag() function +sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \ + s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \ + wp-admin/includes/update.php +# fix file encoding +sed -i -e 's/\r//' license.txt %install mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress @@ -28,11 +34,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf cp -pr * ${RPM_BUILD_ROOT}%{_datadir}/wordpress cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress/'|g" > \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php + ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php /bin/cp %{SOURCE2} ./README.fedora # Remove empty files to make rpmlint happy -find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \; +find ${RPM_BUILD_ROOT} -type f -empty -exec rm -f {} \; # These are docs, remove them from here, docify them later rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} @@ -75,6 +81,46 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Nov 16 2009 Adrian Reber - 2.8.6-2 +- updated to 2.8.6 (Security Release) + +* Wed Oct 21 2009 Adrian Reber - 2.8.5-1 +- updated to 2.8.5 (Hardening Release) + +* Sun Aug 30 2009 Adrian Reber - 2.8.4-1 +- updated to 2.8.4 (security fixes were already available with 2.8.3-2) + +* Tue Aug 11 2009 Adrian Reber - 2.8.3-2 +- another security update to fix "Remote admin reset password": + http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html + +* Mon Aug 03 2009 Adrian Reber - 2.8.3-1 +- updated to 2.8.3 for security fixes + +* Tue Jul 28 2009 Adrian Reber - 2.8.2-1 +- updated to 2.8.2 for security fixes - BZ 512900 +- fixed "wrong-script-end-of-line-encoding" of license.txt +- correctly disable auto update check +- fixed an error message from 'find' during the build + +* Mon Jul 27 2009 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 10 2009 Adrian Reber - 2.8.1-1 +- updated to 2.8.1 for security fixes - BZ 510745 + +* Mon Jun 22 2009 Adrian Reber - 2.8-1 +- updated to 2.8 + +* Wed Feb 25 2009 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 11 2009 Adrian Reber - 2.7.1-1 +- updated to 2.7.1 + +* Wed Nov 26 2008 Adrian Reber - 2.6.5-2 +- updated to 2.6.5 + * Fri Oct 24 2008 Adrian Reber - 2.6.3-1 - updated to 2.6.3