rpms/centerim/devel centerim-4.22.6-url-escape-fedora.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 centerim.spec, 1.18, 1.19 sources, 1.10, 1.11 centerim-4.22.3-url-escape-fedora.patch, 1.1, NONE

Lubomir Rintel lkundrak at fedoraproject.org
Wed Jan 7 23:17:41 UTC 2009 

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6230

Modified Files:
	.cvsignore centerim.spec sources 
Added Files:
	centerim-4.22.6-url-escape-fedora.patch 
Removed Files:
	centerim-4.22.3-url-escape-fedora.patch 
Log Message:
* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
- New upstream release
- Disable openssl due to licensing trouble
- Fix dependencies


centerim-4.22.6-url-escape-fedora.patch:

--- NEW FILE centerim-4.22.6-url-escape-fedora.patch ---
This disables actions -- they're mostly useless anyways, and possess a security
hazard (in past, configuation file with broken escaping was created, and we
have to ignore it).

Lubomir Rintel <lkundrak at v3.sk>

diff -urp centerim-4.22.6.orig/src/centerim.cc centerim-4.22.6/src/centerim.cc
--- centerim-4.22.6.orig/src/centerim.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/centerim.cc	2009-01-07 23:36:20.000000000 +0100
@@ -755,7 +755,7 @@ void centerim::checkmail() {
 
 void centerim::checkconfigs() {
     static const char *configs[] = {
-	"sounds", "colorscheme", "actions", "external", "keybindings", 0
+	"sounds", "colorscheme", "external", "keybindings", 0
     };
 
     struct stat st;
@@ -778,12 +778,9 @@ void centerim::checkconfigs() {
 			face.redraw();
 			break;
 		    case 2:
-			conf->loadactions();
-			break;
-		    case 3:
 			external.load();
 			break;
-		    case 4:
+		    case 3:
 			conf->loadkeys();
 			break;
 		}
@@ -1147,8 +1144,13 @@ icqface::eventviewresult centerim::reade
 	    break;
 
 	case icqface::open:
-	    if(const imurl *m = static_cast<const imurl *>(&ev))
-		conf->execaction("openurl", m->geturl());
+	    if(const imurl *m = static_cast<const imurl *>(&ev)) {
+		if (fork () == 0) {
+		    face.log (m->geturl());
+		    execlp("xdg-open", "xdg-open", m->geturl().c_str(), NULL);
+		    exit (-1);
+		}
+	    }
 	    break;
 
 	case icqface::accept:
diff -urp centerim-4.22.6.orig/src/icqconf.cc centerim-4.22.6/src/icqconf.cc
--- centerim-4.22.6.orig/src/icqconf.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqconf.cc	2009-01-07 23:39:35.000000000 +0100
@@ -274,7 +274,6 @@ void icqconf::load() {
     loadmainconfig();
     loadkeys();
     loadcolors();
-    loadactions();
     loadcaptcha();
     external.load();
 }
@@ -1240,74 +1239,6 @@ void icqconf::setcpconvert(protocolname 
     cpconvert[pname] = fcpconvert;
 }
 
-string icqconf::execaction(const string &name, const string &param) {
-    int inpipe[2], outpipe[2], pid, npos;
-    struct sigaction sact, osact;
-    string torun = actions[name], out;
-    fd_set rfds;
-    char ch;
-
-    if(name == "openurl")
-    {
-	string url = param;
-	int pos = 0, fnd = -1;
-	
-	char enc[4];
-	
-	while( ((fnd = url.find("'", pos)) != -1) || ((fnd = url.find("\"", pos)) != -1) ) {
-		snprintf(enc, 4, "%%%02X", url[fnd]);
-	    url.replace(fnd, 1, enc);
-    	pos = fnd+3;
-	}
-	
-	while((npos = torun.find("$url$")) != -1)
-	    torun.replace(npos, 5, url);
-    }
-
-    if(!pipe(inpipe) && !pipe(outpipe)) {
-	memset(&sact, 0, sizeof(sact));
-	sigaction(SIGCHLD, &sact, &osact);
-	pid = fork();
-
-	if(!pid) {
-	    dup2(inpipe[1], STDOUT_FILENO);
-	    dup2(outpipe[0], STDIN_FILENO);
-
-	    close(inpipe[1]);
-	    close(inpipe[0]);
-	    close(outpipe[0]);
-	    close(outpipe[1]);
-
-	    execl("/bin/sh", "/bin/sh", "-c", torun.c_str(), (char *)NULL );
-	    _exit(0);
-	} else {
-	    close(outpipe[0]);
-	    close(inpipe[1]);
-
-	    while(1) {
-		FD_ZERO(&rfds);
-		FD_SET(inpipe[0], &rfds);
-
-		if(select(inpipe[0]+1, &rfds, 0, 0, 0) < 0) break; else {
-		    if(FD_ISSET(inpipe[0], &rfds)) {
-			if(read(inpipe[0], &ch, 1) != 1) break; else {
-			    out += ch;
-			}
-		    }
-		}
-	    }
-
-	    waitpid(pid, 0, 0);
-	    close(inpipe[0]);
-	    close(outpipe[1]);
-	}
-
-	sigaction(SIGCHLD, &osact, 0);
-    }
-    face.log(_("+ launched the %s action command"), name.c_str());
-    return out;
-}
-
 string icqconf::getprotocolname(protocolname pname) const {
     static const string ptextnames[protocolname_size] = {
 	"icq", "yahoo", "msn", "aim", "irc", "jab", "rss", "lj", "gg", "infocard"
diff -urp centerim-4.22.6.orig/src/icqconf.h centerim-4.22.6/src/icqconf.h
--- centerim-4.22.6.orig/src/icqconf.h	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqconf.h	2009-01-07 23:39:15.000000000 +0100
@@ -344,8 +344,6 @@ class icqconf {
 	bool getshowopenedchats() const { return showopenedchats; }
 	void setshowopenedchats(bool fsoc);
 
-	string execaction(const string &action, const string &param = "");
-
 	imstatus getstatus(protocolname pname);
 	void savestatus(protocolname pname, imstatus st);
 	void setavatar(protocolname pname, const string &ava);
diff -urp centerim-4.22.6.orig/src/icqdialogs.cc centerim-4.22.6/src/icqdialogs.cc
--- centerim-4.22.6.orig/src/icqdialogs.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqdialogs.cc	2009-01-07 23:38:51.000000000 +0100
@@ -1284,7 +1284,6 @@ bool icqface::updateconf(icqconf::regsou
 
 	i = t.addnode(_(" Communications "));
 	t.addleaff(i, 0, 19, _(" SMTP server : %s "), smtp.c_str());
-	t.addleaff(i, 0, 31, _(" HTTP browser : %s "), browser.c_str());
 	t.addleaff(i, 0, 24, _(" HTTP proxy server : %s "), httpproxy.c_str());
 
 	if(!httpproxy.empty())
@@ -1438,10 +1437,6 @@ bool icqface::updateconf(icqconf::regsou
 		    case 30:
 			cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto );
 			break;
-		    case 31:
-		        tmp = inputstr(_("HTTP browser to use: "), browser);
-			if(!tmp.empty()) browser = tmp;
-		        break;
 		    case 32:    
 		        conf->setleftpanelwidth(atol(inputstr(_("Left panel width: "), 
 		            strint(conf->getleftpanelwidth())).c_str()));
@@ -2083,7 +2078,6 @@ bool icqface::setljparams(imxmlevent *ev
 			break;
 
 		    case 20: LJP_LIST("mood", moods, _("(none/custom)")); break;
-		    case 21: LJP_STR("music", _("Currently playing: ")); break;
 		    case 22: LJP_LIST("picture", pictures, _("(default)")); break;
 		    case 23: LJP_STR("mood", _("Current mood: ")); break;
 		    case 25: LJP_STR("taglist", _("Tags for the entry: ")); break;
@@ -2093,9 +2087,6 @@ bool icqface::setljparams(imxmlevent *ev
 		    case 33: LJP_BOOL("backdated"); break;
 		}
 
-	    } else if(b == 1) {
-		ev->setfield("music", conf->execaction("detectmusic"));
-
 	    } else if(b == 2) {
 		r = true;
 
diff -urp centerim-4.22.6.orig/src/icqface.cc centerim-4.22.6/src/icqface.cc
--- centerim-4.22.6.orig/src/icqface.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqface.cc	2009-01-07 23:38:19.000000000 +0100
@@ -2371,8 +2371,13 @@ void icqface::showextractedurls() {
 	for(i = extractedurls.begin(); i != extractedurls.end(); ++i)
 	    m.additem(" " + *i);
 
-	if(n = m.open())
-	    conf->execaction("openurl", extractedurls[n-1]);
+	if(n = m.open()) {
+	    if (fork () == 0) {
+		log (extractedurls[n-1]);
+		execlp("xdg-open", "xdg-open", extractedurls[n-1].c_str(), NULL);
+		exit (-1);
+	    }
+	}
 
 	restoreworkarea();
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jul 2008 21:47:31 -0000	1.10
+++ .cvsignore	7 Jan 2009 23:17:10 -0000	1.11
@@ -1 +1 @@
-centerim-4.22.5-54-ga7548-dirty.tar.gz
+centerim-4.22.6.tar.gz


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- centerim.spec	1 Dec 2008 15:00:18 -0000	1.18
+++ centerim.spec	7 Jan 2009 23:17:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           centerim
 Version:        4.22.6
-Release:        0.2.20080705git%{?dist}
+Release:        1
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,12 +8,11 @@
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-#Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
-Source0:        centerim-4.22.5-54-ga7548-dirty.tar.gz
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
 Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
-Patch8:         centerim-4.22.3-url-escape-fedora.patch
+Patch0:         centerim-4.22.6-url-escape-fedora.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,13 +20,16 @@
 BuildRequires:  ncurses-devel >= 4.2
 BuildRequires:  gettext-devel
 BuildRequires:  gpgme-devel
-BuildRequires:  openssl-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  lzo-devel >= 2
+
+BuildConflicts: openssl-devel
 
 Requires:       xdg-utils
+Requires:       python
 
-Provides:       centericq = %{version}
+Provides:       centericq = 4.21.0
 Obsoletes:      centericq <= 4.21.0
 
 %description
@@ -37,8 +39,8 @@
 
 
 %prep
-%setup -q -n centerim-4.22.5-54-ga7548-dirty
-%patch8 -p1 -b .url-escape-fedora
+%setup -q
+%patch0 -p1 -b .url-escape-fedora
 
 
 %build
@@ -60,7 +62,7 @@
 
 # Remove unnecessary stuff
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 # Install Icon and Menu entry
 install -d $RPM_BUILD_ROOT%{_datadir}/icons
@@ -77,7 +79,10 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO
-%{_bindir}/*
+%{_bindir}/centerim
+%{_bindir}/cimconv
+%{_bindir}/CenterIMLog2HTML.py
+%exclude %{_bindir}/CenterIMLog2HTML.py?
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*.svg
@@ -85,6 +90,11 @@
 
 
 %changelog
+* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
+- New upstream release
+- Disable openssl due to licensing trouble
+- Fix dependencies
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:4.22.6-0.2.20080705git
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jul 2008 21:47:31 -0000	1.10
+++ sources	7 Jan 2009 23:17:10 -0000	1.11
@@ -1 +1 @@
-ede0db8393b9c8f35333bee593abf998  centerim-4.22.5-54-ga7548-dirty.tar.gz
+b26cb94fc5cb68fd3ca8a11ab0bb031c  centerim-4.22.6.tar.gz


--- centerim-4.22.3-url-escape-fedora.patch DELETED ---

More information about the fedora-extras-commits mailing list