We are now at Drupal 7.19 and 6.28 but Pressflow has not released yet those versions and is still at pressflow-7.18 and pressflow-6.27.110. Because today we update the makefiles and our aegir platforms, we will temporary use the Drupal standard core from drupal.org instead of Pressflow. When Pressflow release the up to date versions, we will switch back to it.

Some links for reference:
https://drupal.org/project/drupal
https://github.com/pressflow/7/tags
https://github.com/pressflow/6/tags
#1891192: Changing Drupal 6 and 7 core call from "projects[pressflow]" to "projects[drupal]"

CommentFileSizeAuthor
#6 diff-6.27-6.28-modified.patch26.21 KBj0nathan
#4 diff-6.27-6.28.patch28.41 KBj0nathan
#3 diff-7.18-7.19.patch5.38 KBj0nathan

Comments

j0nathan’s picture

j0nathan commented
Status: Active » Postponed

http://drupalcode.org/project/kplatforms.git/commit/36b0cc5

j0nathan’s picture

j0nathan commented
Status: Postponed » Active

We need Pressflow for performance issues, so I'll try to download Pressflow with the old version and patch it with a diff between standard Drupal cores.

j0nathan’s picture

j0nathan commented
StatusFileSize
new diff-7.18-7.19.patch5.38 KB

Here is a patch for pressflow-7.18.
git diff 7.18 7.19 >diff-7.18-7.19.patch

j0nathan’s picture

j0nathan commented
StatusFileSize
new diff-6.27-6.28.patch28.41 KB

Here is a patch for pressflow-6.27.
git diff 6.27 6.28 >diff-6.27-6.28.patch

j0nathan’s picture

j0nathan commented
Title: Temporary using standard core from drupal.org instead of Pressflow » Patching Pressflow because is not up to date

http://drupalcode.org/project/kplatforms.git/commit/a2cd6c0

j0nathan’s picture

j0nathan commented
StatusFileSize
new diff-6.27-6.28-modified.patch26.21 KB

Patch for Drupal 6 in comment # 4 does not apply well:

patching file CHANGELOG.txt
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file CHANGELOG.txt.rej
patching file COPYRIGHT.txt
patching file MAINTAINERS.txt
patching file includes/bootstrap.inc
Hunk #1 succeeded at 411 (offset 8 lines).
Hunk #2 succeeded at 450 (offset 8 lines).
patching file includes/common.inc
Hunk #1 succeeded at 169 (offset -7 lines).
Hunk #2 succeeded at 289 (offset -7 lines).
Hunk #3 succeeded at 526 (offset -7 lines).
Hunk #4 succeeded at 1418 (offset -7 lines).
Hunk #5 succeeded at 1436 (offset -7 lines).
Hunk #6 succeeded at 1589 (offset -7 lines).
Hunk #7 succeeded at 3834 (offset -3 lines).
patching file includes/database.mysql.inc
patching file includes/database.mysqli.inc
patching file includes/database.pgsql.inc
patching file includes/file.inc
Hunk #1 FAILED at 38.
Hunk #2 succeeded at 903 (offset 38 lines).
1 out of 2 hunks FAILED -- saving rejects to file includes/file.inc.rej
patching file includes/form.inc
patching file includes/install.mysql.inc
patching file includes/install.mysqli.inc
patching file includes/install.pgsql.inc
patching file includes/theme.inc
patching file misc/drupal.js
patching file misc/tableheader.js
patching file modules/blogapi/blogapi.install
patching file modules/book/book.pages.inc
patching file modules/comment/comment-wrapper.tpl.php
patching file modules/comment/comment.install
patching file modules/comment/comment.module
Hunk #1 succeeded at 1823 (offset 4 lines).
patching file modules/dblog/dblog.install
patching file modules/dblog/dblog.module
patching file modules/filter/filter.module
patching file modules/forum/forum.module
patching file modules/locale/locale.install
patching file modules/menu/menu.module
patching file modules/node/node.pages.inc
patching file modules/node/node.tpl.php
patching file modules/openid/openid.install
patching file modules/profile/profile-wrapper.tpl.php
patching file modules/statistics/statistics.install
patching file modules/system/system.install
Hunk #1 succeeded at 1184 (offset 10 lines).
Hunk #2 succeeded at 2586 (offset 10 lines).
Hunk #3 succeeded at 2727 (offset 14 lines).
patching file modules/system/system.module
patching file modules/user/user.admin.inc
patching file modules/user/user.module
Hunk #1 succeeded at 540 with fuzz 1.
patching file scripts/drupal.sh
patching file update.php

Attached is a new patch to use.

j0nathan’s picture

j0nathan commented
Status: Active » Needs review

http://drupalcode.org/project/kplatforms.git/commit/ab9ae50

j0nathan’s picture

j0nathan commented
Component: Makefiles » Patch request
Status: Needs review » Fixed

I close this issue because the patches work in our environment. We will change that in the makefiles to the new Pressflow versions when they release them and on our next update-day.

j0nathan’s picture

j0nathan commented

For documentation (from IRC):
https://github.com/pressflow/6/pull/64
https://github.com/pressflow/6/pull/64/files#L8R59

greggles’s picture

greggles
he/him
Primary language English
Location Denver, Colorado, USA
commented
Component: Patch request » Makefiles
Status: Fixed » Needs review

The patch in #6 misses this change https://github.com/pressflow/6/pull/64/files#L8R59 from the merge josh k performed.

I'm not sure if that's a good thing or not.

Here's a diff of #6 and https://github.com/pressflow/6/pull/64/ https://gist.github.com/4560459

greggles’s picture

greggles
he/him
Primary language English
Location Denver, Colorado, USA
commented
Component: Makefiles » Patch request
Status: Needs review » Fixed

Sorry, didn't mean to change those.

j0nathan’s picture

j0nathan commented
Status: Fixed » Needs work

Thanks, I'll check the info from comment # 10.
Re-opening.

j0nathan’s picture

j0nathan commented
Status: Needs work » Fixed

Pressflow released their version pressflow-6.28.111 which should resolve comments # 4 to 12.
http://drupalcode.org/project/kplatforms.git/commit/fe59702

Still no tag for Drupal 7.19.

Status: Fixed as per comment # 8.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

j0nathan’s picture

j0nathan commented
Title: Patching Pressflow because is not up to date » Patching Pressflow 7.18 with Drupal 7.19 and Pressflow 6.27.110 with Drupal 6.28

  • Commit 36b0cc5 on 7.x-6.x, 8.x-1.x, 8.x-2.x, lock by j0nathan: 
    Issue #1891292 : Temporary using standard core from drupal.org instead...
  • Commit a2cd6c0 on 7.x-6.x, 8.x-1.x, 8.x-2.x, lock by j0nathan:
    Issue #1891292 : Patching Pressflow because is not up to date.
  • Commit ab9ae50 on 7.x-6.x, 8.x-1.x, 8.x-2.x, lock by j0nathan:
    Issue #1891292 : New patch for Pressflow 6.
  • Commit fe59702 on 8.x-1.x, 8.x-2.x, lock by j0nathan:
    Issue #1891292 : Updated Pressflow tag to pressflow-6.28.111.