Bug 113502 - irc/inspircd - Update for 1.1.8 freebsd port, fixes permissions error
Summary: irc/inspircd - Update for 1.1.8 freebsd port, fixes permissions error
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: Martin Matuska
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-06-09 23:20 UTC by Craig Edwards
Modified: 2007-06-14 00:45 UTC (History)
1 user (show)

See Also:


Attachments
file.shar (11.55 KB, text/plain)
2007-06-09 23:20 UTC, Craig Edwards
no flags Details
inspircd-1.1.8.patch (15.12 KB, patch)
2007-06-12 13:55 UTC, Martin Matuska
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Craig Edwards 2007-06-09 23:20:00 UTC
	The 1.1.8 port submitted at 22:40 BST changes the permissions on /usr/local/bin to be 0700. This updated shar for the port fixes the issue. This is why this update is marked serious/high, to save devlopers hassle testing this port, and to save users systems being left in odd states by installing said port.

How-To-Repeat: 	Install older port submitted at 22:40 to see issue.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-06-10 02:36:58 UTC
Class Changed
From-To: change-request->maintainer-update

Fix category (submitter is maintainer)
Comment 2 Martin Matuska freebsd_committer freebsd_triage 2007-06-11 13:36:59 UTC
Responsible Changed
From-To: freebsd-ports-bugs->mm

I'll take this one.
Comment 3 Martin Matuska freebsd_committer freebsd_triage 2007-06-12 13:55:16 UTC
The following is wrong with the submitted port:

Major issues:
a) changes permisions of ${PREFIX}/bin to 0700
b) pkg-plist incomplete (configuration files)

Minor issues (portlint complains):
a) SHA256 checksum missing in distinfo
b) wrong section order in Makefile
c) installs shared libraries (no USE_LDCONFIG used)

Please review (and approve) my attached patch against current CVS, that
should fix all these issues. Downloadable from:
http://mm.vx.sk/diffs/inspircd-1.1.8.diff
Comment 4 Martin Matuska freebsd_committer freebsd_triage 2007-06-12 14:03:48 UTC
State Changed
From-To: open->feedback

Awaiting maintainer's feedback.
Comment 5 Martin Matuska freebsd_committer freebsd_triage 2007-06-13 16:06:02 UTC
Looks like beech@FreeBSD.org already commited a update - and that was
to an earlier PR, this one should have superseded it!

Old PR: ports/113501

And beech's commit was without fixes like the ${PREFIX}/bin mode.
A reworked patch for the latest tree is attached that fixes more
issues (like install of configuration files).

Maintainer please check and approve (the port has to be fixed as soon
as possible).
Link: http://mm.vx.sk/diffs/inspircd-1.1.8_1.diff

Index: ports/irc/inspircd/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/inspircd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ports/irc/inspircd/Makefile    12 Jun 2007 11:46:26 -0000    1.4
+++ ports/irc/inspircd/Makefile    13 Jun 2007 14:52:29 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=    inspircd
 PORTVERSION=    1.1.8
+PORTREVISION=    1
 CATEGORIES=    irc
 MASTER_SITES=    http://www.inspircd.org/downloads/ \
         http://www.chatspike.net/downloads/
@@ -18,6 +19,7 @@
 WRKSRC=    ${WRKDIR}/inspircd
 USE_GMAKE=    yes
 USE_BZIP2=    yes
+USE_LDCONFIG=    ${PREFIX}/lib/inspircd
 
 # Configure script is written in perl
 USE_PERL5_BUILD=yes
@@ -29,6 +31,9 @@
         --prefix=${PREFIX}/inspircd --binary-dir=${PREFIX}/bin \
         --enable-remote-ipv6 --disable-interactive
 
+post-patch:
+    @${REINPLACE_CMD} -e 's/INSTMODE = 0700/INSTMODE = 0755/g'
${WRKSRC}/.Makefile.inc
+
 # 1.0.6 Makefile forgets to make these directories
 # during install. We make these ourselves. This may
 # be fixed in a later version of InspIRCd.
@@ -43,5 +48,9 @@
     @${STRIP_CMD} ${PREFIX}/lib/inspircd/*.so
     @${STRIP_CMD} ${PREFIX}/bin/inspircd
     @${CHMOD} -R a+rX ${PREFIX}/bin/inspircd ${PREFIX}/inspircd/
${PREFIX}/lib/inspircd/
+.for FILE in censor conf filter helpop motd quotes rules
+    @${TEST} -f ${PREFIX}/etc/inspircd/inspircd.${FILE} || \
+        ${CP} ${PREFIX}/etc/inspircd/inspircd.${FILE}.example
${PREFIX}/etc/inspircd/inspircd.${FILE}
+.endfor
 
 .include <bsd.port.mk>
Index: ports/irc/inspircd/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/irc/inspircd/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- ports/irc/inspircd/pkg-plist    12 Jun 2007 11:18:03 -0000    1.2
+++ ports/irc/inspircd/pkg-plist    13 Jun 2007 14:52:29 -0000
@@ -1,9 +1,4 @@
 bin/inspircd
-etc/inspircd/inspircd.motd.example
-etc/inspircd/inspircd.helpop-full.example
-etc/inspircd/inspircd.helpop.example
-etc/inspircd/inspircd.censor.example
-etc/inspircd/inspircd.filter.example
 inspircd/inspircd
 inspircd/.gdbargs
 lib/inspircd/libIRCDasyncdns.so
@@ -195,13 +190,27 @@
 @dirrm inspircd
 @dirrm lib/inspircd/modules
 @dirrm lib/inspircd
+@unexec if cmp -s %D/etc/inspircd/inspircd.censor.example
%D/etc/inspircd/inspircd.censor; then rm -f
%D/etc/inspircd/inspircd.censor; fi
+etc/inspircd/inspircd.censor.example
+@exec if [ ! -f %B/inspircd.censor ] ; then cp -p %D/%F
%B/inspircd.censor; fi
 @unexec if cmp -s %D/etc/inspircd/inspircd.conf.example
%D/etc/inspircd/inspircd.conf; then rm -f
%D/etc/inspircd/inspircd.conf; fi
 etc/inspircd/inspircd.conf.example
-@exec if [ ! -f %D/etc/inspircd/inspircd.conf ] ; then cp -p %D/%F
%B/inspircd.conf; fi
+@exec if [ ! -f %B/inspircd.conf ] ; then cp -p %D/%F
%B/inspircd.conf; fi
+@unexec if cmp -s %D/etc/inspircd/inspircd.filter.example
%D/etc/inspircd/inspircd.filter; then rm -f
%D/etc/inspircd/inspircd.filter; fi
+etc/inspircd/inspircd.filter.example
+@exec if [ ! -f %B/inspircd.filter ] ; then cp -p %D/%F
%B/inspircd.filter; fi
+@unexec if cmp -s %D/etc/inspircd/inspircd.helpop.example
%D/etc/inspircd/inspircd.helpop; then rm -f
%D/etc/inspircd/inspircd.helpop; fi
+etc/inspircd/inspircd.helpop.example
+@exec if [ ! -f %B/inspircd.helpop ] ; then cp -p %D/%F
%B/inspircd.helpop; fi
+@unexec if cmp -s %D/etc/inspircd/inspircd.helpop-full.example
%D/etc/inspircd/inspircd.helpop; then rm -f
%D/etc/inspircd/inspircd.helpop; fi
+etc/inspircd/inspircd.helpop-full.example
+@unexec if cmp -s %D/etc/inspircd/inspircd.motd.example
%D/etc/inspircd/inspircd.motd; then rm -f
%D/etc/inspircd/inspircd.motd; fi
+etc/inspircd/inspircd.motd.example
+@exec if [ ! -f %B/inspircd.motd ] ; then cp -p %D/%F
%B/inspircd.motd; fi
 @unexec if cmp -s %D/etc/inspircd/inspircd.quotes.example
%D/etc/inspircd/inspircd.quotes; then rm -f
%D/etc/inspircd/inspircd.quotes; fi
 etc/inspircd/inspircd.quotes.example
-@exec if [ ! -f %D/etc/inspircd/inspircd.quotes ] ; then cp -p %D/%F
%B/inspircd.quotes; fi
+@exec if [ ! -f %B/inspircd.quotes ] ; then cp -p %D/%F
%B/inspircd.quotes; fi
 @unexec if cmp -s %D/etc/inspircd/inspircd.rules.example
%D/etc/inspircd/inspircd.rules; then rm -f
%D/etc/inspircd/inspircd.rules; fi
 etc/inspircd/inspircd.rules.example
-@exec if [ ! -f %D/etc/inspircd/inspircd.rules ] ; then cp -p %D/%F
%B/inspircd.rules; fi
+@exec if [ ! -f %B/inspircd.rules ] ; then cp -p %D/%F
%B/inspircd.rules; fi
 @dirrmtry etc/inspircd
Comment 6 brain 2007-06-13 17:28:31 UTC
I am fine with these changes and approve the patch.

Regards
Craig
Comment 7 dfilter service freebsd_committer freebsd_triage 2007-06-14 00:39:08 UTC
mm          2007-06-13 23:39:01 UTC

  FreeBSD ports repository

  Modified files:
    irc/inspircd         Makefile pkg-plist 
  Log:
  - bugfix: example files install and their pkg-plist entries
  - added USE_LDCONFIG entry
  
  PR:             ports/113502
  Submitted by:   Craig Edwards <brain@inspircd.org> (maintainer)
  Pointyhat to:   sat
  Approved by:    maintainer, garga (mentor)
  
  Revision  Changes    Path
  1.6       +6 -0      ports/irc/inspircd/Makefile
  1.3       +17 -8     ports/irc/inspircd/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 8 Martin Matuska freebsd_committer freebsd_triage 2007-06-14 00:42:39 UTC
State Changed
From-To: feedback->closed

Commited with changes, thanks.