Bug 196028 - [MAINTAINER] www/typo3: update to 7.0.2
Summary: [MAINTAINER] www/typo3: update to 7.0.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords: patch-ready
Depends on:
Blocks:
 
Reported: 2014-12-16 14:44 UTC by Helmut Ritter
Modified: 2015-02-07 20:31 UTC (History)
3 users (show)

See Also:


Attachments
typo3-7.0.2.patch (906.01 KB, patch)
2014-12-16 14:44 UTC, Helmut Ritter
no flags Details | Diff
Update to 7.0.2, replace @dirrmtry with @dir (905.91 KB, patch)
2015-01-04 20:39 UTC, Helmut Ritter
no flags Details | Diff
replace @dirrmtry with @dir (904.83 KB, patch)
2015-01-21 15:13 UTC, Helmut Ritter
no flags Details | Diff
replace @dirrmtry with @dir (904.86 KB, patch)
2015-01-21 15:26 UTC, Helmut Ritter
no flags Details | Diff
replace @dirrmtry with @dir, cleanup pkg-plist (904.55 KB, patch)
2015-01-22 14:01 UTC, Helmut Ritter
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Helmut Ritter 2014-12-16 14:44:12 UTC
Created attachment 150645 [details]
typo3-7.0.2.patch

The old port maintained an 1MB pkg-plist that lists all files from the source-tarball. It is hard to maintain and I cannot see a reason why this port requires a static plist. I adapted www/typo3-lts (dynamic plist) to create this port.

- Bug- and security fix
- See http://typo3.org/news/article/typo3-cms-4539-629-and-702-released/
- Tests: http://www.charlieroot.de/FreeBSD/PRs/build_www_typo3_2014-12-16-15-29.log
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2015-01-01 16:40:33 UTC
Why change Created by: line? According to svn logs you are not the
person that first ported this software.

While switching to dynamically generated plist is ok it uses
deprecated @dirrmtry keyword. See /usr/ports/CHANGES entry 20140922.
Comment 2 Helmut Ritter 2015-01-02 19:23:47 UTC
> Why change Created by: line? According to svn logs you are not
> the person that first ported this software.

I copy&pasted the Makefile from www/typo3-lts. Also, there is almost nothing left from the original Makefile.

> While switching to dynamically generated plist is ok it uses
> deprecated @dirrmtry keyword. See /usr/ports/CHANGES entry 20140922.

Let me check that. I'll upload a new patch soon.
Comment 3 Helmut Ritter 2015-01-04 20:39:36 UTC
Created attachment 151340 [details]
Update to 7.0.2, replace @dirrmtry with @dir

- For tests see http://www.charlieroot.de/FreeBSD/PRs/build_www_typo3_2015-01-04-21-25.log
Comment 4 John Marino freebsd_committer freebsd_triage 2015-01-20 18:46:29 UTC
There are still minor issues with this.

1) You can't change the "created by" line (#1).  That's an honor for the first person that created the port, it's not something that is updated

2) on the generated plist list, wouldn't the hardcoded "root,wheel" settings break this build for non-root users?
Comment 5 Helmut Ritter 2015-01-21 15:02:04 UTC
- For tests see http://www.charlieroot.de/FreeBSD/PRs/build_www_typo3_2015-01-21-15-48.log
Comment 6 Helmut Ritter 2015-01-21 15:13:41 UTC
Created attachment 151968 [details]
replace @dirrmtry with @dir
Comment 7 Helmut Ritter 2015-01-21 15:26:32 UTC
Created attachment 151969 [details]
replace @dirrmtry with @dir

Hope that patch is OK now :)
Comment 8 Helmut Ritter 2015-01-21 15:28:02 UTC
Comment on attachment 151968 [details]
replace @dirrmtry with @dir

Obsolete
Comment 9 John Marino freebsd_committer freebsd_triage 2015-01-21 17:43:46 UTC
most pkg-plist have zero @dir on them.

This line, "${FIND} -d * -type d -regex "${TYPO3WWW}/${PORTNAME}-${TYPO3RELEASE}/*.*" | ${SORT} | ${SED} -ne 's#^#@dir #p' >> ${TMPPLIST}"

is created one "@dir" for each directory found, right?

If so, that's incorrect.  You probably don't need any for $TYPO3WWW
Comment 10 Helmut Ritter 2015-01-22 10:44:32 UTC
I have not found an appropriate documentation for dynamic plists yet, so forgive my ignorance.

- an entry for each file is required
- a dir() entry for each root directory is required
- no entries for sub directories are required, except they have different permissions than the default (root, wheel)
-  @owner and @group are deprecated by (owner, group, file) and @dir(owner, group, file)

So an appropriate plist would look like that:

<lots of files>
@dir www/typo3-LTS
@dir www/typo3_src-6.2.9
@dir(www,www,) www/typo3_src-6.2.9/typo3/ext

Is that correct? Are there any preferences in the order of the entries?
Comment 11 John Marino freebsd_committer freebsd_triage 2015-01-22 11:21:07 UTC
(In reply to freebsd-ports from comment #10)
> I have not found an appropriate documentation for dynamic plists yet, so forgive my ignorance.

It's because dynamic plists are frowned upon.  This one is barely acceptable since it's > 6000 entries

> - an entry for each file is required

yes

- a dir() entry for each root directory is required

no.  Only if it's outside of the $PREFIX or has non-standard ownership/permissions

- no entries for sub directories are required, except they have different permissions than the default (root, wheel)

this is also true for "root" directories (I'm not sure where "root" distinction comes from)

-  @owner and @group are deprecated by (owner, group, file) and @dir(owner, group, file)

They aren't deprecated.  @owner and @group are for files, @dir is for directories



Order should be "sort"
Comment 12 Helmut Ritter 2015-01-22 14:00:58 UTC
Next try:

- For tests see http://www.charlieroot.de/FreeBSD/PRs/build_www_typo3_2015-01-22-14-34.log
Comment 13 Helmut Ritter 2015-01-22 14:01:42 UTC
Created attachment 152013 [details]
replace @dirrmtry with @dir, cleanup pkg-plist
Comment 14 John Marino freebsd_committer freebsd_triage 2015-01-22 14:04:44 UTC
That looks fine, so I'm going to promote this to "patch-ready" status for final review and commit.  Thanks!
Comment 15 Helmut Ritter 2015-01-22 14:57:56 UTC
Thank you. I will also apply those changes to www/typo3-lts, shall we re-open PR196482 or create a new PR?
Comment 16 John Marino freebsd_committer freebsd_triage 2015-02-06 12:16:38 UTC
bug 196482 is closed so its better to open a new PR.
Comment 17 John Marino freebsd_committer freebsd_triage 2015-02-06 12:25:40 UTC
this diff is missing the distinfo file!!

Can you paste the contents here so we know the generated version matches what you think it should be?
Comment 18 John Marino freebsd_committer freebsd_triage 2015-02-06 12:31:37 UTC
fyi, it build fine if I use this value of distinfo:

SHA256 (typo3_src-7.0.2.tar.gz) = 8a88d7758039714aa41bdb9dbfdfc37902aeaed6d1acb4ec53cd34cee4a3fbc8
SIZE (typo3_src-7.0.2.tar.gz) = 21456771


Does that match what you had?
Comment 19 John Marino freebsd_committer freebsd_triage 2015-02-06 12:34:34 UTC
yes, luckily an older version ( attachment 151968 [details] ) has that distinfo file (but not the first version).  That's good enough for me but I'm not quite sure what happened there.
Comment 20 commit-hook freebsd_committer freebsd_triage 2015-02-06 12:38:10 UTC
A commit references this bug:

Author: marino
Date: Fri Feb  6 12:37:40 UTC 2015
New revision: 378531
URL: https://svnweb.freebsd.org/changeset/ports/378531

Log:
  www/typo3: Upgrade version 6.1.9 => 7.0.2

  While here, convert large static pkg-plist (> 9000 lines) to be
  dynamically generated.

  PR:		196028
  Submitted by:	maintainer (freebsd-ports - charlieroot.de)

Changes:
  head/www/typo3/Makefile
  head/www/typo3/distinfo
  head/www/typo3/pkg-descr
  head/www/typo3/pkg-plist
Comment 21 John Marino freebsd_committer freebsd_triage 2015-02-06 12:39:03 UTC
done, thanks.
Comment 22 Helmut Ritter 2015-02-07 20:31:30 UTC
Sorry for the confusion and thanks for commiting.