- Update to 0.9.8.2

Security:	Fixes local root exploit (see ports/92359)
Submitted by:	Ion-Mihai IOnut Tetcu <itetcu@people.tecnik93.com>
		(maintainer)
PR:		ports/92554

6 files changed, 34 insertions, 33 deletions

diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile
index 0217449b52fd..af0cf0978022 100644
--- a/net-im/kpopup/Makefile
+++ b/net-im/kpopup/Makefile
@@ -4,32 +4,37 @@
 #
 # $FreeBSD$
 #
-# $Tecnik: ports/net-im/kpopup/Makefile,v 1.2 2006/01/25 23:29:03 itetcu Exp $
+# $Tecnik: ports/net-im/kpopup/Makefile,v 1.8 2006/01/30 14:17:07 itetcu Exp $
 #
 
 PORTNAME=	kpopup
-PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTVERSION=	0.9.8.2
 CATEGORIES=	net-im kde
-MASTER_SITES=	http://www.henschelsoft.de/kpopup/
+MASTER_SITES=	http://www.henschelsoft.de/kpopup/ \
+		http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
 
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	KDE program for sending and receiving MS Windows WinPopup messages
 
-RUN_DEPENDS=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS=	smbclient:${PORTSDIR}/net/samba3
+
+SUB_FILES=	pkg-message
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
-USE_REINPLACE=	yes
+
+KPOPUP_DIR=	/var/tmp/kpopup
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/kpopup/misc.cpp \
-		${WRKSRC}/kpopup/make_popup.cpp ${WRKSRC}/kpopup/main.cpp
-	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/kpopup/misc.h
+	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/src/make_popup.cpp
+	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/admin/ltmain.sh
+	@${REINPLACE_CMD} "s^/usr/bin^${LOCALBASE}/bin^; s^/var/lib/kpopup^${KPOPUP_DIR}^" \
+		${WRKSRC}/src/misc.h
 
 post-install:
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+	@${MKDIR} ${KPOPUP_DIR} && ${CHMOD} 777 ${KPOPUP_DIR}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-im/kpopup/distinfo b/net-im/kpopup/distinfo
index e93f68d48c30..dce6e2c9a169 100644
--- a/net-im/kpopup/distinfo
+++ b/net-im/kpopup/distinfo
@@ -1,2 +1,3 @@
-MD5 (kpopup-0.9.1.tar.gz) = 0fe30038ce7785ec533fd90a61a79b91
-SIZE (kpopup-0.9.1.tar.gz) = 527306
+MD5 (kpopup-0.9.8.2.tar.gz) = f3cb22df62c4062dd172dd28aa92d4db
+SHA256 (kpopup-0.9.8.2.tar.gz) = 50e4affc4cd401561b3142248a96febf9146851fe2e5429492a7fb6218e77491
+SIZE (kpopup-0.9.8.2.tar.gz) = 546981
diff --git a/net-im/kpopup/files/patch-kpopup_misc.h b/net-im/kpopup/files/patch-kpopup_misc.h
deleted file mode 100644
index 098f6db0184e..000000000000
--- a/net-im/kpopup/files/patch-kpopup_misc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kpopup/misc.h.orig	Sun Aug 26 17:44:03 2001
-+++ ./kpopup/misc.h	Mon May  5 09:47:04 2003
-@@ -20,7 +20,7 @@
- #include "kpopup.h"
- 
- #undef DEBUG
--#define SMBPATH "/usr/bin" //Path of smbclient
-+#define SMBPATH "%%LOCALBASE%%/bin" //Path of smbclient
- #define TMPPOPUPFILE "/tmp/kpopup-message"
- #define SETSIG(sig, fun, fla)	sa.sa_handler = fun; \
-     sa.sa_flags = fla; \
diff --git a/net-im/kpopup/files/pkg-message.in b/net-im/kpopup/files/pkg-message.in
new file mode 100644
index 000000000000..84bde2f10deb
--- /dev/null
+++ b/net-im/kpopup/files/pkg-message.in
@@ -0,0 +1,9 @@
+--------------------------------------------------------------------------
+
+NOTE: To be able to receive messages with KPopup, you need to change your
+Samba configuration file (smb.conf): locate the [global] section in the
+configuration file, and add the following line:
+
+message command = sh -c 'export DISPLAY:0; %%PREFIX%%/bin/kpopup %s %f;' &
+
+---------------------------------------------------------------------------
diff --git a/net-im/kpopup/pkg-message b/net-im/kpopup/pkg-message
index cd3a5c5237b4..e69de29bb2d1 100644
--- a/net-im/kpopup/pkg-message
+++ b/net-im/kpopup/pkg-message
@@ -1,5 +0,0 @@
-NOTE: To be able to receive messages with KPopup, you need to change your
-Samba configuration file (smb.conf): locate the [global] section in the
-configuration file, and add the following line:
-
-message command = sh -c 'export DISPLAY:0; %%PREFIX%%/bin/kpopup %s %f;' &
diff --git a/net-im/kpopup/pkg-plist b/net-im/kpopup/pkg-plist
index b1eb64fb0f80..74a0dea1b065 100644
--- a/net-im/kpopup/pkg-plist
+++ b/net-im/kpopup/pkg-plist
@@ -1,18 +1,20 @@
 bin/kpopup
-share/applnk/Applications/kpopup.desktop
+bin/receivepopup.sh
+share/applications/kde/kpopup.desktop
 share/icons/hicolor/16x16/apps/kpopup.png
 share/icons/hicolor/32x32/apps/kpopup.png
 share/icons/hicolor/48x48/apps/kpopup.png
 share/icons/locolor/16x16/apps/kpopup.png
 share/icons/locolor/32x32/apps/kpopup.png
 share/locale/de/LC_MESSAGES/kpopup.mo
-%%PORTDOCS%%share/doc/HTML/en/kpopup/common
+share/locale/fr/LC_MESSAGES/kpopup.mo
+share/locale/nb/LC_MESSAGES/kpopup.mo
+share/locale/es/LC_MESSAGES/kpopup.mo
 %%PORTDOCS%%share/doc/HTML/en/kpopup/index-1.html
 %%PORTDOCS%%share/doc/HTML/en/kpopup/index-2.html
 %%PORTDOCS%%share/doc/HTML/en/kpopup/index-3.html
 %%PORTDOCS%%share/doc/HTML/en/kpopup/index-4.html
-%%PORTDOCS%%share/doc/HTML/en/kpopup/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/en/kpopup/index.docbook
 %%PORTDOCS%%share/doc/HTML/en/kpopup/index.html
 %%PORTDOCS%%share/doc/HTML/en/kpopup/logotp3.png
-@dirrm share/doc/HTML/en/kpopup
+%%PORTDOCS%%@dirrm share/doc/HTML/en/kpopup
+@dirrmtry /var/tmp/kpopup