Bug 190164 - [STAGE] [PATCH] fix for sysutils/samesame
Summary: [STAGE] [PATCH] fix for sysutils/samesame
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-24 09:40 UTC by Stefan Eßer
Modified: 2014-06-08 08:35 UTC (History)
3 users (show)

See Also:


Attachments
samesame.diff.bz2 (1.75 KB, text/plain)
2014-05-24 09:40 UTC, Stefan Eßer
no flags Details
Uncompressed version of the patch (3.33 KB, patch)
2014-06-06 15:20 UTC, Stefan Eßer
no flags Details | Diff
An replacement patch file (3.32 KB, patch)
2014-06-06 18:50 UTC, akruijff
akruijff: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Stefan Eßer freebsd_committer freebsd_triage 2014-05-24 09:40:00 UTC
The sysutils/samesame port does not build with CLANG and defines NO_STAGE=yes.

Fix: Apply the attached diff to fix both issues (NO_STAGE and build error).
The diff also adds a LICENSE line to reflect the 2 clause BSD license
granted in the sources.
How-To-Repeat: Try to build samesame on -CURRENT.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-24 09:40:04 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-24 09:40:04 UTC
Maintainer of sysutils/samesame,

Please note that PR ports/190164 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/190164

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Alex de Kruijff 2014-05-24 22:32:10 UTC
Sorry the file seems corrupt.

> bunzip2 samesame.diff.bz2

bunzip2: Data integrity error when decompressing.
        Input file = samesame.diff.bz2, output file = samesame.diff
Comment 4 John Marino freebsd_committer freebsd_triage 2014-06-06 12:53:06 UTC
Stefan, why not just upload a plain text diff?
Comment 5 Stefan Eßer freebsd_committer freebsd_triage 2014-06-06 13:57:10 UTC
Sorry, the name of the attachment does not show, that it is in fact uuencoded.
Download the attachment, uudecode it, and then you have a correct bzip2-compressed file.
Comment 6 John Marino freebsd_committer freebsd_triage 2014-06-06 14:00:21 UTC
Can you do that and attach a new version please?  With 1900+ ports PRs to go through, we really don't need unnecessary work (we can just pick another PR that's ready to go)
Comment 7 Stefan Eßer freebsd_committer freebsd_triage 2014-06-06 15:20:40 UTC
Created attachment 143455 [details]
Uncompressed version of the patch
Comment 8 John Marino freebsd_committer freebsd_triage 2014-06-06 15:27:30 UTC
Okay, I took a quick look.

comment 1) There are so many PLIST entries now, it's best to have a separate pkg-plist file now, don't you think?

comment 2) That series of STRIP_CMD in post installation is suspicious, it tells me the vendor makefile is using it's own install.  Can it be modified to use BSD_INSTALL_PROGRAM or something like that?  My gut instinct says STRIP_CMD is applying a band-aid instead of the better fix.
Comment 9 Stefan Eßer freebsd_committer freebsd_triage 2014-06-06 16:06:06 UTC
I agree to both of your comments, but wanted to leave such changes to the registered MAINTAINER. If you want to grab it, then feel free to extend the patch to include a do-install target instead of the fixups performed in post-install and to introduce a pkg-plist. I really don't mind ;-)
Comment 10 John Marino freebsd_committer freebsd_triage 2014-06-06 16:09:43 UTC
Okay, I was confused.  I thought you were the maintainer.  I see the maintainer is not CC'd for any of this, I'm adding him now so that he can review all this backlog.
Comment 11 akruijff 2014-06-06 18:50:51 UTC
Created attachment 143461 [details]
An replacement patch file
Comment 12 John Marino freebsd_committer freebsd_triage 2014-06-06 19:03:35 UTC
I don't understand -- it looks pretty close to updated patch 1, but doesn't address the (missing) pkg-plist or why it's stripping post-install rather than striping during the install...

What changed from first version?
Comment 13 akruijff 2014-06-06 19:24:58 UTC
I've send this to the wrong e-mail address, so you coudn't see:

The file samesame.diff contains an error for the files/patch-buffer.cpp.
I've corrected this in the attached samesame2.diff. I removed the wrongly added '+' in front of each line and tested it.

1) For me the list isn't that large that it is unworkable. But I don't
have any objections to a separate pkg-plist file.
  
2) This is my only port and I am unexperianced, but I'll have a look at
this.

Tanks for you good work.
Comment 14 akruijff 2014-06-06 19:26:48 UTC
1) and 2) are reactions to the comments.
Comment 15 John Marino freebsd_committer freebsd_triage 2014-06-06 19:31:35 UTC
obviously a lot of this is subjective, but yes I think that PLIST is long enough to warrant a separate file.  Usually embedded plists are < 5 files.

If you can't figure out how to patch / sed the vendor makefile then just cry uncle and I'll show you (assuming that is preferable the list long sed list).  You should try just for experience sake though.
Comment 16 John Marino freebsd_committer freebsd_triage 2014-06-06 21:40:33 UTC
I'm having some confusion.

There is no files/patch-buffer.cpp, so any patch to that file fails.

I also don't see it in diff#1, only the one the maintainer just upload.

If I had to guess, the first part of the diff is a patch to Makefile, and the second part of the diff is the contents of what should be "files/patch-buffer.cpp".

If that was the intent, that diff isn't correct.  the diff should have added the entire files/patch-buffer.cpp file which currently doesn't exist.

So what was the intent here?
Comment 17 commit-hook freebsd_committer freebsd_triage 2014-06-06 22:23:06 UTC
A commit references this bug:

Author: marino
Date: Fri Jun  6 22:22:47 UTC 2014
New revision: 356859
URL: http://svnweb.freebsd.org/changeset/ports/356859

Log:
  sysutils/samesame: Stage support and simplify

  In addition to the provided stage support:
   * separate pkg-plist was created
   * install-strip was implified with the use of INSTALL_TARGET
   * most configure switches pulled into options framework
   * redundant post-install pkg-message removed
   * 2-clause BSD license documented
   * USE_BZIP2 converted
   * patch to buffer.cpp added by maintainer

  PR:		ports/190164
  Submitted by:	Stephan Esser
  Approved by:	maintainer (Alex de Kruijff)
  Simplified by:	marino

Changes:
  head/sysutils/samesame/Makefile
Comment 18 commit-hook freebsd_committer freebsd_triage 2014-06-06 22:24:08 UTC
A commit references this bug:

Author: marino
Date: Fri Jun  6 22:23:56 UTC 2014
New revision: 356861
URL: http://svnweb.freebsd.org/changeset/ports/356861

Log:
  sysutils/samesame: forgotten files!

  In addition to the provided stage support:
   * separate pkg-plist was created
   * install-strip was implified with the use of INSTALL_TARGET
   * most configure switches pulled into options framework
   * redundant post-install pkg-message removed
   * 2-clause BSD license documented
   * USE_BZIP2 converted
   * patch to buffer.cpp added by maintainer

  PR:		ports/190164
  Submitted by:	Stephan Esser
  Approved by:	maintainer (Alex de Kruijff)
  Simplified by:	marino

Changes:
  head/sysutils/samesame/files/patch-src_buffer.cpp
  head/sysutils/samesame/pkg-plist
Comment 19 John Marino freebsd_committer freebsd_triage 2014-06-06 22:27:05 UTC
heh, first time I ever left off new files to commit.

Stefan, I carried your patch much further.  You should both review what I did as the port is much cleaner and simpler now.

John