Bug 194441 - [maintainer-update] [patch] devel/poco-devel version 1.5.4.
Summary: [maintainer-update] [patch] devel/poco-devel version 1.5.4.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Bartek Rutkowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-10-18 02:15 UTC by joe
Modified: 2014-12-17 11:41 UTC (History)
1 user (show)

See Also:


Attachments
Poco 1.5.4 update. (9.26 KB, patch)
2014-10-18 02:15 UTC, joe
no flags Details | Diff
Poudriere Log (130.74 KB, application/gzip)
2014-10-18 02:20 UTC, joe
no flags Details
Poudriere Log (Gziped) (129.32 KB, application/gzip)
2014-11-09 18:27 UTC, joe
no flags Details
Poco 1.5.4 update. (10.45 KB, patch)
2014-11-09 18:28 UTC, joe
no flags Details | Diff
Poco 1.5.4 update. (9.19 KB, patch)
2014-11-10 14:11 UTC, joe
no flags Details | Diff
Poco 1.5.4 update. (8.69 KB, patch)
2014-12-11 14:03 UTC, joe
no flags Details | Diff
Poco 1.5.4 update. (8.69 KB, patch)
2014-12-11 18:41 UTC, joe
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description joe 2014-10-18 02:15:09 UTC
Created attachment 148416 [details]
Poco 1.5.4 update.

devel/poco-devel version 1.5.4.

Note: There are 2 new patch files.
Comment 1 joe 2014-10-18 02:20:14 UTC
Created attachment 148417 [details]
Poudriere Log

GZip Poudriere log.
Comment 2 joe 2014-10-18 02:26:31 UTC
The Poudriere log may be viewed with zcat.
Comment 3 John Marino freebsd_committer freebsd_triage 2014-10-31 18:37:50 UTC
the poudriere log is a single file?

Or did you gzip the entire poudriere bulk run directory?
Comment 4 joe 2014-10-31 22:46:32 UTC
I gzip'd the log file, not the directory. The file is larger than the maximum post size.
Comment 5 John Marino freebsd_committer freebsd_triage 2014-10-31 22:54:23 UTC
you're right, 7MB log file.

The stage-qa check shows a bunch of libraries that need stripping.  Did you see that?  Two bin programs too.

In the worst case you can strip those with a post-install target.
Comment 6 joe 2014-10-31 23:19:08 UTC
Those unstripped files are for debug purposes. So they need to stay unstripped. Same with the test binaries.
Comment 7 John Marino freebsd_committer freebsd_triage 2014-10-31 23:22:32 UTC
er, no.
They are only left unstripped if WITH_DEBUG is set.  Otherwise they are stripped.  Just like the other 24,000 ports.

${STRIP_CMD} morphs based on setting of WITH_DEBUG.
Comment 8 John Marino freebsd_committer freebsd_triage 2014-11-01 08:01:33 UTC
The other way to think about this: 

The port getting warnings on the sanity check implemented by portmgr, so it's checking the policies that portmgr wants.

If you need further confirmation that the ports should pass all the stage-qa tests, including the stripped test, you can ask on #bsdports irc channel.

A mini-test is doing this in the port's directory:

> make -V STRIP_CMD

then

> make WITH_DEBUG=yes -V STRIP_CMD

and see how it changes the value.
Comment 9 joe 2014-11-09 18:27:37 UTC
Created attachment 149226 [details]
Poudriere Log (Gziped)
Comment 10 joe 2014-11-09 18:28:10 UTC
Created attachment 149227 [details]
Poco 1.5.4 update.
Comment 11 John Marino freebsd_committer freebsd_triage 2014-11-10 13:37:08 UTC
okay, this:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoUtild.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoPDFd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoNetd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoNetSSLd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoJSONd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoDataSQLited.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoXMLd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoCppParserd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoFoundationd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoDataODBCd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoMongoDBd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoCryptod.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoDataMySQLd.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoDatad.so.24
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libPocoZipd.so.24

should be replace with
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so



this:
+@dir include/Poco/DOM
+@dir include/Poco/SAX
+@dir include/Poco/XML
+@dir include/Poco/Util
+@dir include/Poco/Net
+@dir include/Poco/Zip
+@dir include/Poco/PDF
+@dir include/Poco/MongoDB
+@dir include/Poco/JSON
+@dir include/Poco/Dynamic
+@dir include/Poco/Data/SQLite
+@dir include/Poco/Data/ODBC
+@dir include/Poco/Data/MySQL
+@dir include/Poco/Data
+@dir include/Poco/Crypto
+@dir include/Poco/CppParser
+@dir include/Poco

should be *** COMPLETELY *** removed

@dir is not a new alias for @dirrm or @dirrmtry, it has a specific purpose (see /usr/ports/CHANGES to learn about how it's supposed to be used)
Comment 12 John Marino freebsd_committer freebsd_triage 2014-11-10 13:39:01 UTC
FYI, makeplist was dumping a bunch of @dir lines that weren't necessary but that's been fixed now.  Still, don't trust "make makeplist" at all, you have to check every line.
Comment 13 joe 2014-11-10 14:11:57 UTC
Created attachment 149259 [details]
Poco 1.5.4 update.
Comment 14 John Marino freebsd_committer freebsd_triage 2014-11-10 14:15:23 UTC
Okay.
I suspect with a glob we could reduce the number of strip commands from 4 to 2 in the post-install target but I know we are both tired of this PR and it works as it is, so I'm promoting the PR now.
Comment 15 Bartek Rutkowski freebsd_committer freebsd_triage 2014-11-14 09:54:20 UTC
Hi,

The patch you've supplied seems to have few issues:

* pkg-plist fails to apply
* the size in distinfo is different from the one that gets downloaded
* the patch-Data-MySQL-testsuite-Makefile fails to apply

Please, update your ports tree to latest version and fix the above issues, so I could test your submission with new patch.

Kind regards,
Bartek Rutkowski
Comment 16 Bartek Rutkowski freebsd_committer freebsd_triage 2014-11-26 11:28:12 UTC
Joe, any news on that?
Comment 17 joe 2014-11-26 21:33:02 UTC
The patch applies cleanly for myself. The file patch-Data-MySQL-testsuite-Makefile does not exist.
Comment 18 Bartek Rutkowski freebsd_committer freebsd_triage 2014-11-27 21:25:18 UTC
Joe, my ports tree for poco-devel is on revision 373520 and unfortunately, your patch isnt applying properly for me. Unless you can get your sources updated to this revision and provide a working patch, I wont be able to commit that port, I am afraid.
Comment 19 joe 2014-12-02 22:29:29 UTC
I successfully applied the patch against Git revision:

commit 455793d73333ba3fb4dadf46fd7ca13dab001f15
Author: delphij <delphij@FreeBSD.org>
Date:   Tue Dec 2 18:53:38 2014 +0000

    Add CPE data.

    Requested by:       des

At this point, I'm not sure what to do - are you using patch -p1 < <patch>?

Any input is appreciated.

Thanks,
-Joe
Comment 20 Bartek Rutkowski freebsd_committer freebsd_triage 2014-12-07 11:28:07 UTC
Joe,

The last log entry from the SVN version (which is official source of ports tree) looks like that:

------------------------------------------------------------------------
r371551 | bapt | 2014-10-27 12:03:00 +0100 (Mon, 27 Oct 2014) | 2 lines

Cleanup plist

Can you please check out the SVN version of ports tree and test applying your patch against that version?

Kind regards,
Bartek Rutkowski
Comment 21 joe 2014-12-11 14:03:50 UTC
Created attachment 150471 [details]
Poco 1.5.4 update.

Please give this patch a go. It seems to work for me on SVN checkout.
Comment 22 Bartek Rutkowski freebsd_committer freebsd_triage 2014-12-11 16:17:10 UTC
Hi,

Thanks for new patch, it applies just fine now, however, when testing it fails on incorrect distinfo data, as you can see in the log:

http://pd.valinor.palantiri.org/data/11amd64-default/2014-12-11_17h14m29s/logs/errors/poco-devel-1.5.4.log

Kind regards,
Bartek Rutkowski
Comment 23 joe 2014-12-11 18:41:11 UTC
Created attachment 150482 [details]
Poco 1.5.4 update.

Please give this a go. I am currently trying it under Poudriere.

The upstream package changed SHAs, so I had to update two things.
Comment 24 commit-hook freebsd_committer freebsd_triage 2014-12-17 11:23:34 UTC
A commit references this bug:

Author: robak
Date: Wed Dec 17 11:23:17 UTC 2014
New revision: 374839
URL: https://svnweb.freebsd.org/changeset/ports/374839

Log:
  devel/poco-devel: update 1.5.3 -> 1.5.4

  PR:		194441
  Submitted by:	Joseph Benden <joe@thrallingpenguin.com>

Changes:
  head/devel/poco-devel/Makefile
  head/devel/poco-devel/distinfo
  head/devel/poco-devel/files/patch-Foundation-Makefile
  head/devel/poco-devel/files/patch-pcre
  head/devel/poco-devel/files/patch-pcre_internal.h
  head/devel/poco-devel/pkg-plist
Comment 25 Bartek Rutkowski freebsd_committer freebsd_triage 2014-12-17 11:41:06 UTC
Committed, thanks for your work!