rpms/centerim/F-8 Centerim_b.svg, NONE, 1.1 centerim-4.22.3-url-escape-fedora.patch, NONE, 1.1 centerim.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 centerim.spec, 1.5, 1.6 sources, 1.3, 1.4 centerim-4.22.1-icqack.patch, 1.1, NONE centerim-4.22.1-libyahoo.patch, 1.1, NONE centerim-4.22.1-ljtags.patch, 1.1, NONE centerim-4.22.1-ljtypo.patch, 1.1, NONE centerim-4.22.1-msn-NOT.patch, 1.1, NONE centerim-4.22.1-overflows.patch, 1.1, NONE centerim-4.22.1-quitask.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Sun Mar 30 08:59:45 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/centerim/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913/F-8
Modified Files:
.cvsignore centerim.spec sources
Added Files:
Centerim_b.svg centerim-4.22.3-url-escape-fedora.patch
centerim.desktop
Removed Files:
centerim-4.22.1-icqack.patch centerim-4.22.1-libyahoo.patch
centerim-4.22.1-ljtags.patch centerim-4.22.1-ljtypo.patch
centerim-4.22.1-msn-NOT.patch centerim-4.22.1-overflows.patch
centerim-4.22.1-quitask.patch
Log Message:
Merge from devel
--- NEW FILE Centerim_b.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="480"
height="480"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
sodipodi:docbase="/home/stick/work/centerim-icon"
sodipodi:docname="centerim_b.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
inkscape:export-filename="/home/stick/work/centerim.png"
inkscape:export-xdpi="12"
inkscape:export-ydpi="12">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.0455661"
inkscape:cx="289.96093"
inkscape:cy="333.68985"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1280"
inkscape:window-height="975"
inkscape:window-x="0"
inkscape:window-y="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-572.36218)">
<rect
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:24;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4106"
width="480"
height="480"
x="0"
y="572.36218"
ry="128.09889"
rx="128.09889" />
<rect
style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:24;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5077"
width="480"
height="24"
x="0"
y="800.36218" />
<rect
style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:24;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect5079"
width="24"
height="480"
x="228"
y="572.36218" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:24;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 240.44415,652.35539 C 185.0445,652.26723 131.11426,680.96542 101.4443,732.35538 C 57.284343,808.84273 83.519456,906.75782 160.00673,950.91786 C 236.49401,995.07785 334.40905,968.84276 378.569,892.35536 L 309.25657,852.35537 C 295.41528,876.25239 269.59148,892.35536 240.00665,892.35536 C 195.84671,892.35535 160.00673,856.51537 160.00673,812.35537 C 160.00673,768.19535 195.8467,732.35538 240.00665,732.35538 C 269.59148,732.35537 295.41528,748.45835 309.25657,772.35537 L 378.569,732.35538 C 363.84902,706.85959 345.50233,688.51288 320.00656,673.79288 C 294.90917,659.30288 267.49979,652.39845 240.44415,652.35539 z "
id="path2160" />
</g>
</svg>
centerim-4.22.3-url-escape-fedora.patch:
--- NEW FILE centerim-4.22.3-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 Kundrak <lkundrak at redhat.com>
diff -urp centerim-4.22.3.orig/src/centerim.cc centerim-4.22.3/src/centerim.cc
--- centerim-4.22.3.orig/src/centerim.cc 2008-03-11 21:40:28.000000000 +0100
+++ centerim-4.22.3/src/centerim.cc 2008-03-25 22:23:35.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.3.orig/src/icqconf.cc centerim-4.22.3/src/icqconf.cc
--- centerim-4.22.3.orig/src/icqconf.cc 2008-03-11 21:40:28.000000000 +0100
+++ centerim-4.22.3/src/icqconf.cc 2008-03-25 22:21:50.000000000 +0100
@@ -212,7 +212,6 @@ void icqconf::load() {
loadmainconfig();
loadkeys();
loadcolors();
- loadactions();
loadcaptcha();
external.load();
}
diff -urp centerim-4.22.3.orig/src/icqdialogs.cc centerim-4.22.3/src/icqdialogs.cc
--- centerim-4.22.3.orig/src/icqdialogs.cc 2008-03-11 21:40:28.000000000 +0100
+++ centerim-4.22.3/src/icqdialogs.cc 2008-03-25 22:21:50.000000000 +0100
@@ -1270,7 +1270,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())
@@ -1424,10 +1423,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()));
@@ -2060,7 +2055,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;
@@ -2070,9 +2064,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.3.orig/src/icqface.cc centerim-4.22.3/src/icqface.cc
--- centerim-4.22.3.orig/src/icqface.cc 2008-03-11 21:40:28.000000000 +0100
+++ centerim-4.22.3/src/icqface.cc 2008-03-25 22:21:50.000000000 +0100
@@ -2246,7 +2246,11 @@ void icqface::showextractedurls() {
m.additem(" " + *i);
if(n = m.open())
- conf.execaction("openurl", extractedurls[n-1]);
+ if (fork () == 0) {
+ log (extractedurls[n-1]);
+ execlp("xdg-open", "xdg-open", extractedurls[n-1].c_str(), NULL);
+ exit (-1);
+ }
restoreworkarea();
}
--- NEW FILE centerim.desktop ---
[Desktop Entry]
Name=CenterIM
Comment=Text-based Instant Messenging client
Comment[cs]=Textový Instant Messenging klient
Comment[sk]=Textový Instant Messenging klient
GenericName=CenterIM Messenger
Exec=centerim
Icon=Centerim_b
Terminal=true
Type=Application
Categories=Application;Network;InstantMessaging;IRCClient;ConsoleOnly;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 Oct 2007 06:06:20 -0000 1.3
+++ .cvsignore 30 Mar 2008 08:59:10 -0000 1.4
@@ -1 +1 @@
-centerim-20071003.tar.gz
+centerim-4.22.4.tar.gz
Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-8/centerim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- centerim.spec 14 Dec 2007 22:18:08 -0000 1.5
+++ centerim.spec 30 Mar 2008 08:59:10 -0000 1.6
@@ -1,33 +1,18 @@
-# These are ugly and will go away on next formal release
-%define stable_ver 4.22.1
-%define snapshot_ver 20071003
-
Name: centerim
-Version: %{snapshot_ver}
-Release: 3%{?dist}.2
+Version: 4.22.4
+Release: 1%{?dist}
+Epoch: 1
Summary: Text mode menu- and window-driven IM
Group: Applications/Internet
License: GPLv2+
URL: http://www.centerim.org/
-Source0: http://www.centerim.org/download/%{name}-%{version}.tar.gz
-
-Patch0: centerim-4.22.1-libyahoo.patch
-Patch7: centerim-4.22.1-overflows.patch
+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
-## feature fixes
-# Fix ljhook
-Patch101: centerim-4.22.1-ljtags.patch
-Patch102: centerim-4.22.1-ljtypo.patch
-# Fix MSN
-Patch103: centerim-4.22.1-msn-NOT.patch
-# Fix ICQ
-Patch104: centerim-4.22.1-icqack.patch
-
-## feature enh
-# provided by Andy Shevchenko... will ask before quit
-Patch201: centerim-4.22.1-quitask.patch
+Patch8: centerim-4.22.3-url-escape-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +22,9 @@
BuildRequires: gpgme-devel
BuildRequires: openssl-devel
BuildRequires: libjpeg-devel
+BuildRequires: desktop-file-utils
+
+Requires: xdg-utils
Provides: centericq = %{version}
Obsoletes: centericq <= 4.21.0
@@ -46,15 +34,11 @@
the ICQ2000, Yahoo!, MSN, AIM TOC, IRC, Gadu-Gadu and Jabber protocols.
Internal RSS reader and a client for LiveJournal are provided.
+
%prep
-%setup -q -n %{name}-%{stable_ver}
-%patch0 -p1 -b .libyahoo
-%patch7 -p1 -b .overflows
-%patch101 -p1 -b .ljtags
-%patch102 -p1 -b .ljtypo
-%patch103 -p1 -b .msn-NOT
-%patch104 -p1 -b .icqack
-%patch201 -p1 -b .quitask
+%setup -q
+%patch8 -p1 -b .url-escape-fedora
+
%build
%configure \
@@ -63,37 +47,77 @@
--enable-locales-fix
make %{?_smp_flags}
+
%check
make check
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
+# Remove unnecessary stuff
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+# Install Icon and Menu entry
+install -d $RPM_BUILD_ROOT%{_datadir}/icons
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons
+desktop-file-install --vendor=fedora \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+ %{SOURCE2}
+
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO
%{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/*.svg
%{_mandir}/man1/*
+
%changelog
-* Fri Dec 14 2007 Lubomir Kundrak <lkundrak at redhat.com> - 20071003-3.2
+* Sun Mar 30 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.4-1
+- 4.22.4 with Yahoo protocol fixes
+
+* Tue Mar 25 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.3-2
+- Escape URLs before opening with a browser (CVE-2008-1467) (#438871)
+- Cherry-pick a couple of Yahoo IM fixes
+
+* Tue Mar 11 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.3-1
+- New upstream release
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:4.22.2-4
+- Autorebuild for GCC 4.3
+
+* Mon Jan 07 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.2-3
+- Icon and menu entry
+
+* Fri Dec 14 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.2-2
- Replace centericq
-* Wed Nov 28 2007 Lubomir Kundrak <lkundrak at redhat.com> - 20071003-3.1
-- Attempt to fix problems with states of server-side contacts (#402301)
+* Sat Dec 08 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.2-1
+- New upstream release
+
+* Wed Nov 28 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.1.20071124-2
+- Synchronized with GIT to fix the ICQ client side contacts problems (#402301)
+
+* Thu Oct 25 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.1.20071022-1
+- New upstream tarball, functionally equivalent to previous revision of the pkg
-* Tue Oct 23 2007 Lubomir Kundrak <lkundrak at redhat.com> - 20071003-3
-- Thanks to Stéphane Bisinger, MSN works
+* Tue Oct 23 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:4.22.1.20071003-4
+- lkundrak's dumb, dumb, dumb and he .... up the versioning, bumping epoch
+- Merging the upstream git snapshot:
+- Our fixes upstreamed
+- Fix for MSN NOT messages handling
+- Fixed french translation
* Mon Oct 08 2007 Lubomir Kundrak <lkundrak at redhat.com> - 20071003-2
- Fixed BuildRoot
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Oct 2007 06:06:20 -0000 1.3
+++ sources 30 Mar 2008 08:59:10 -0000 1.4
@@ -1 +1 @@
-ca0b169aee9f730d63fff0fb4f7af03e centerim-20071003.tar.gz
+7ddf3b2485b916c8e7ff63642dcdeb27 centerim-4.22.4.tar.gz
--- centerim-4.22.1-icqack.patch DELETED ---
--- centerim-4.22.1-libyahoo.patch DELETED ---
--- centerim-4.22.1-ljtags.patch DELETED ---
--- centerim-4.22.1-ljtypo.patch DELETED ---
--- centerim-4.22.1-msn-NOT.patch DELETED ---
--- centerim-4.22.1-overflows.patch DELETED ---
--- centerim-4.22.1-quitask.patch DELETED ---
More information about the fedora-extras-commits
mailing list