rpms/anaconda/F-9 anaconda.spec,1.683,1.684
by Tom Callaway
Author: spot
Update of /cvs/pkgs/rpms/anaconda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3577
Modified Files:
anaconda.spec
Log Message:
fix build
Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -r1.683 -r1.684
--- anaconda.spec 1 Oct 2008 13:35:21 -0000 1.683
+++ anaconda.spec 1 Oct 2008 14:15:48 -0000 1.684
@@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 11.4.0.82
-Release: 3
+Release: 4
License: GPLv2+
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
@@ -153,7 +153,7 @@
%prep
%setup -q
-%patch0 -p1 -b .sparc
+%patch0 -p1
cp %{SOURCE2} loader2/
%build
@@ -220,6 +220,9 @@
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 11.4.0.82-4
+- don't use ".sparc" suffix for patch, confuses during %%install
+
* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 11.4.0.82-3
- ExcludeArch: sparc64
13 years, 7 months
rpms/netbeans/devel netbeans-6.1-50-ide-launcher.patch, 1.1, 1.2 netbeans.spec, 1.2, 1.3
by Victor G. Vasilyev
Author: victorv
Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1513
Modified Files:
netbeans-6.1-50-ide-launcher.patch netbeans.spec
Log Message:
Release 6: Showing an incorrect EULA at startup is disabled ( https://bugzilla.redhat.com/show_bug.cgi?id=464820 ).
netbeans-6.1-50-ide-launcher.patch:
Index: netbeans-6.1-50-ide-launcher.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans-6.1-50-ide-launcher.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-6.1-50-ide-launcher.patch 10 Sep 2008 00:38:06 -0000 1.1
+++ netbeans-6.1-50-ide-launcher.patch 1 Oct 2008 14:02:22 -0000 1.2
@@ -1,13 +1,13 @@
-diff -Nur -x '*.orig' -x '*~' netbeans-new-source/ide/launcher/unix/netbeans netbeans-new-source.new/ide/launcher/unix/netbeans
---- netbeans-new-source/ide/launcher/unix/netbeans 2008-03-26 18:55:01.000000000 +0300
-+++ netbeans-new-source.new/ide/launcher/unix/netbeans 2008-06-10 19:44:30.000000000 +0400
+diff -Nur netbeans-ide-launcher/ide/launcher/unix/netbeans netbeans-ide-launcher.new/ide/launcher/unix/netbeans
+--- netbeans-ide-launcher/ide/launcher/unix/netbeans 2008-06-30 17:47:50.000000000 +0400
++++ netbeans-ide-launcher.new/ide/launcher/unix/netbeans 2008-10-01 03:32:59.000000000 +0400
@@ -54,16 +54,18 @@
fi
done
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
-+# Patch for Debian/Ubuntu where launcher is in /usr/bin
++# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.1/bin
if [ -f "$progdir"/../etc/netbeans.conf ] ; then
@@ -18,9 +18,17 @@
-# if [ -f /etc/netbeans.conf ] ; then
-# . /etc/netbeans.conf
-# fi
-+ if [ -f /etc/netbeans.conf ] ; then
-+ . /etc/netbeans.conf
-+ fi
++if [ -f /etc/netbeans.conf ] ; then
++ . /etc/netbeans.conf
++fi
# #68373: look for userdir, but do not modify "$@"
+@@ -199,7 +201,6 @@
+ --branding nb \
+ --clusters '"$netbeans_clusters"' \
+ -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
+- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
+ ${netbeans_default_options} \
+ '"$@"'
+ ;;
Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netbeans.spec 19 Sep 2008 15:17:30 -0000 1.2
+++ netbeans.spec 1 Oct 2008 14:02:22 -0000 1.3
@@ -81,7 +81,7 @@
Name: %{nb_}
Version: %{nb_ver}
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Integrated Development Environment (IDE)
Group: Development/Tools
License: GPLv2 with exceptions or CDDL
@@ -461,6 +461,9 @@
%doc nbbuild/standard-nbm-license.txt
%changelog
+* Wed Oct 01 2008 Victor G. Vasilyev <victor.vasilyev(a)sun.com> 6.1-6
+- Showing an incorrect EULA at startup is disabled (#464820). The netbeans-6.1-50-ide-launcher.patch is modified.
+
* Mon Sep 15 2008 Victor G. Vasilyev <victor.vasilyev(a)sun.com> 6.1-5
- A location of the productid file is changed
- The swingapp module is removed from the small IDE configuration (netbeans-6.1-60-small-ide-config.patch)
13 years, 7 months
rpms/ant/devel ant.spec,1.96,1.97
by Tom Callaway
Author: spot
Update of /cvs/pkgs/rpms/ant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv876
Modified Files:
ant.spec
Log Message:
fix bogus perl requires/provides
Index: ant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant/devel/ant.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ant.spec 26 Sep 2008 15:28:19 -0000 1.96
+++ ant.spec 1 Oct 2008 13:55:28 -0000 1.97
@@ -55,7 +55,7 @@
Name: ant
Version: 1.7.1
-Release: 7.1%{?dist}
+Release: 7.2%{?dist}
Epoch: 0
Summary: Ant build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -517,6 +517,23 @@
iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8
mv LICENSE.utf8 LICENSE
+# Provides: exclude perl(oata), perl(examples)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$'
+__EOF__
+%define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+
+# Requires: exclude bogus perl(the)
+cat <<__EOF__ > %{name}-perl.req
+#!/bin/sh
+/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$'
+__EOF__
+%define __perl_requires %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.req
+chmod +x %{__perl_requires}
+
# -----------------------------------------------------------------------------
%build
@@ -1275,6 +1292,10 @@
# -----------------------------------------------------------------------------
%changelog
+* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 0:1.7.1-7.2
+- Exclude bogus perl(the) Requires
+- Exclude bogus perl(oata), perl(examples) Provides
+
* Fri Sep 26 2008 Permaine Cheung <pcheung(a)redhat.com> 0:1.7.1-7.1
- Define with_gcj_support
13 years, 7 months
comps/po et.po,1.14,1.15
by Transifex System User
Author: transif
Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv823/po
Modified Files:
et.po
Log Message:
2008-10-01 Tõivo Leedjärv <toivol(a)gmail.com> (via toivol(a)fedoraproject.org)
* po/et.po: Updated Estonian translation.
Index: et.po
===================================================================
RCS file: /cvs/pkgs/comps/po/et.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- et.po 1 Oct 2008 13:51:17 -0000 1.14
+++ et.po 1 Oct 2008 13:54:09 -0000 1.15
@@ -11,7 +11,7 @@
"Project-Id-Version: comps\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-01 10:56+0000\n"
-"PO-Revision-Date: 2008-10-01 16:47+0200\n"
+"PO-Revision-Date: 2008-10-01 16:53+0200\n"
"Last-Translator: Tõivo Leedjärv <toivol(a)gmail.com>\n"
"Language-Team: Estonian <Eesti>\n"
"MIME-Version: 1.0\n"
@@ -1474,7 +1474,7 @@
#: ../comps-f9.xml.in.h:206
#: ../comps-f10.xml.in.h:217
msgid "X Software Development"
-msgstr "X tarkvara arendus"
+msgstr "X aknasüsteemi tarkvaraarendus"
#: ../comps-f7.xml.in.h:192
#: ../comps-f8.xml.in.h:200
13 years, 7 months
comps/po et.po,1.13,1.14
by Transifex System User
Author: transif
Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv645/po
Modified Files:
et.po
Log Message:
2008-10-01 Tõivo Leedjärv <toivol(a)gmail.com> (via toivol(a)fedoraproject.org)
* po/et.po: Updated Estonian translation.
Index: et.po
===================================================================
RCS file: /cvs/pkgs/comps/po/et.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- et.po 25 Sep 2008 20:05:52 -0000 1.13
+++ et.po 1 Oct 2008 13:51:17 -0000 1.14
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: comps\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-22 09:26+0000\n"
-"PO-Revision-Date: 2008-09-25 23:02+0300\n"
+"POT-Creation-Date: 2008-10-01 10:56+0000\n"
+"PO-Revision-Date: 2008-10-01 16:47+0200\n"
"Last-Translator: Tõivo Leedjärv <toivol(a)gmail.com>\n"
"Language-Team: Estonian <Eesti>\n"
"MIME-Version: 1.0\n"
@@ -795,7 +795,7 @@
#: ../comps-el4.xml.in.h:38
#: ../comps-el5.xml.in.h:38
msgid "News Server"
-msgstr "Uudiste server"
+msgstr "Uudisteserver"
#: ../comps-f7.xml.in.h:103
#: ../comps-f8.xml.in.h:111
13 years, 7 months
rpms/rhythmbox/devel rhythmbox.spec,1.206,1.207
by Bastien Nocera
Author: hadess
Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32517
Modified Files:
rhythmbox.spec
Log Message:
* Wed Oct 01 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.11.6-9.r5956
- Update release version
Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- rhythmbox.spec 1 Oct 2008 11:37:16 -0000 1.206
+++ rhythmbox.spec 1 Oct 2008 13:41:18 -0000 1.207
@@ -3,7 +3,7 @@
Name: rhythmbox
Summary: Music Management Application
Version: 0.11.6
-Release: r5956%{?dist}
+Release: 9.r5956%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Multimedia
URL: http://www.gnome.org/projects/rhythmbox/
@@ -197,6 +197,9 @@
%{_libdir}/rhythmbox/plugins/upnp_coherence
%changelog
+* Wed Oct 01 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.11.6-9.r5956
+- Update release version
+
* Wed Oct 01 2008 - Bastien Nocera <bnocera(a)redhat.com> 0.11.6-r5956
- Update to latest trunk version, with GIO support and very many
bug fixes
13 years, 7 months
rpms/anaconda/F-9 anaconda.spec,1.682,1.683
by Tom Callaway
Author: spot
Update of /cvs/pkgs/rpms/anaconda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32292
Modified Files:
anaconda.spec
Log Message:
ExcludeArch: sparc64
Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -r1.682 -r1.683
--- anaconda.spec 1 Oct 2008 13:09:08 -0000 1.682
+++ anaconda.spec 1 Oct 2008 13:35:21 -0000 1.683
@@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 11.4.0.82
-Release: 2
+Release: 3
License: GPLv2+
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
@@ -12,6 +12,8 @@
Source1: screenfont-sparc.gz
Source2: keymaps-sparc
Patch0: anaconda-11.4.0.82-sparc-fixes.patch
+# No reason to build this for sparc64.
+ExcludeArch: sparc64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -218,6 +220,9 @@
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 11.4.0.82-3
+- ExcludeArch: sparc64
+
* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 11.4.0.82-2
- fix sparc support (merge relevant changes from old Aurora)
13 years, 7 months
rpms/openoffice.org/devel openoffice.org.spec, 1.1663, 1.1664 openoffice.org-3.0.0.ooo94435.nospanishmodern.patch, 1.1, NONE
by Caolan McNamara
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31925
Modified Files:
openoffice.org.spec
Removed Files:
openoffice.org-3.0.0.ooo94435.nospanishmodern.patch
Log Message:
next version
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1663
retrieving revision 1.1664
diff -u -r1.1663 -r1.1664
--- openoffice.org.spec 29 Sep 2008 15:26:39 -0000 1.1663
+++ openoffice.org.spec 1 Oct 2008 13:32:38 -0000 1.1664
@@ -1,5 +1,5 @@
%define oootag OOO300
-%define ooomilestone 8
+%define ooomilestone 9
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -116,7 +116,6 @@
Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
Patch46: workspace.vcl94.patch
Patch47: workspace.vcl95.patch
-Patch48: openoffice.org-3.0.0.ooo94435.nospanishmodern.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1318,7 +1317,6 @@
%patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
%patch46 -p1 -b .workspace.vcl94.patch
%patch47 -p1 -b .workspace.vcl95.patch
-%patch48 -p1 -b .ooo94435.nospanishmodern.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3683,8 +3681,8 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Mon Sep 29 2008 Caolán McNamara <caolanm(a)redhat.com> - 1:3.0.0-8.2
-- add openoffice.org-3.0.0.ooo94435.nospanishmodern.patch
+* Wed Oct 01 2008 Caolán McNamara <caolanm(a)redhat.com> - 1:3.0.0-9.1
+- next candidate
* Sun Sep 28 2008 Caolán McNamara <caolanm(a)redhat.com> - 1:3.0.0-8.1
- next candidate
--- openoffice.org-3.0.0.ooo94435.nospanishmodern.patch DELETED ---
13 years, 7 months
rpms/xorg-x11-drv-nv/F-9 nv-1.1.1-nv34-tweaks.patch, 1.1, 1.2 xorg-x11-drv-nv.spec, 1.71, 1.72
by Daniel Williams
Author: dcbw
Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31953
Modified Files:
nv-1.1.1-nv34-tweaks.patch xorg-x11-drv-nv.spec
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw(a)redhat.com> 2.1.10-2
- Port Toshiba Tecra M2 NV34 panel tweak to pciaccess
nv-1.1.1-nv34-tweaks.patch:
Index: nv-1.1.1-nv34-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9/nv-1.1.1-nv34-tweaks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-1.1.1-nv34-tweaks.patch 14 Jun 2006 23:03:31 -0000 1.1
+++ nv-1.1.1-nv34-tweaks.patch 1 Oct 2008 13:32:48 -0000 1.2
@@ -1,13 +1,21 @@
---- xf86-video-nv-1.1.1/src/nv_dac.c.nv34-tweak 2006-06-14 14:26:46.000000000 -0400
-+++ xf86-video-nv-1.1.1/src/nv_dac.c 2006-06-14 14:38:20.000000000 -0400
-@@ -60,8 +60,14 @@
+diff -up xf86-video-nv-2.1.10/src/nv_dac.c.nv34-tweak xf86-video-nv-2.1.10/src/nv_dac.c
+--- xf86-video-nv-2.1.10/src/nv_dac.c.nv34-tweak 2008-06-22 15:35:04.000000000 -0400
++++ xf86-video-nv-2.1.10/src/nv_dac.c 2008-09-30 09:22:21.000000000 -0400
+@@ -42,8 +42,21 @@ NVDACPanelTweaks(NVPtr pNv, NVRegPtr sta
we can do is experiment and apply hacks. */
if(((pNv->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) {
- /* At least one NV34 laptop needs this workaround. */
- tweak = -1;
++#if XSERVER_LIBPCIACCESS
++ if (((pNv->PciInfo->subvendor_id & 0xffff) == 0x1179) &&
++ ((pNv->PciInfo->subdevice_id & 0xffff) == 0x0020))
++#else
+ if (((pNv->PciInfo->subsysVendor & 0xffff) == 0x1179) &&
-+ ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020)) {
++ ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020))
++#endif
++ {
++
+ /* Toshiba Tecra M2 */
+ tweak = 1;
+ } else {
Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-9/xorg-x11-drv-nv.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- xorg-x11-drv-nv.spec 1 Jul 2008 21:25:34 -0000 1.71
+++ xorg-x11-drv-nv.spec 1 Oct 2008 13:32:48 -0000 1.72
@@ -5,7 +5,7 @@
Summary: Xorg X11 nv video driver
Name: xorg-x11-drv-nv
Version: 2.1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -37,8 +37,7 @@
%prep
%setup -q -n %{tarball}-%{version}
-# disable for now, needs porting to pciaccess
-#patch0 -p1 -b .nv34-tweak
+%patch0 -p1 -b .nv34-tweak
%patch4 -p1 -b .reserve-fbarea
%patch5 -p1 -b .starve
%patch6 -p1 -b .panel
@@ -69,6 +68,9 @@
%{_mandir}/man4/nv.4*
%changelog
+* Tue Sep 30 2008 Dan Williams <dcbw(a)redhat.com> 2.1.10-2
+- Port Toshiba Tecra M2 NV34 panel tweak to pciaccess
+
* Tue Jul 01 2008 Adam Jackson <ajax(a)redhat.com> 2.1.10-1
- nv 2.1.10
13 years, 7 months
rpms/squirrelmail/F-9 squirrelmail-1.4.15-tr-fix.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 squirrelmail-1.4.6-japanese-multibyte-view-body.patch, 1.2, 1.3 squirrelmail-1.4.6-japanese-multibyte-view-text.patch, 1.3, 1.4 squirrelmail.spec, 1.56, 1.57
by Michal Hlavinka
Author: mhlavink
Update of /cvs/extras/rpms/squirrelmail/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31574
Modified Files:
.cvsignore sources
squirrelmail-1.4.6-japanese-multibyte-view-body.patch
squirrelmail-1.4.6-japanese-multibyte-view-text.patch
squirrelmail.spec
Added Files:
squirrelmail-1.4.15-tr-fix.patch
Log Message:
update to 1.4.16 (resolves: #464185 - CVE-2008-3663 Squirrelmail session hijacking)
squirrelmail-1.4.15-tr-fix.patch:
--- NEW FILE squirrelmail-1.4.15-tr-fix.patch ---
diff -up squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po.BAD squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po
--- squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po.BAD 2008-09-05 13:51:40.000000000 -0400
+++ squirrelmail-1.4.15/locale_tempdir/locale/tr_TR/LC_MESSAGES/squirrelmail.po 2008-09-05 13:53:32.000000000 -0400
@@ -130,6 +130,10 @@ msgstr "Seçili öðeyi düzenle"
msgid "Delete selected"
msgstr "Seçili öðeyi sil"
+#, fuzzy
+msgid "Compose to selected"
+msgstr "Seçili öðeyi sil"
+
msgid "sort by nickname"
msgstr "rumuza göre sýrala"
@@ -705,7 +709,8 @@ msgstr "Okundu:"
msgid "Your message"
msgstr "Sizin mesajýnýz"
-msgid "Sent:"
+#, fuzzy
+msgid "Sent"
msgstr "Gönderildi:"
#, php-format
@@ -907,10 +912,12 @@ msgstr "Veritabaný hatasý: %s"
msgid "Address book is read-only"
msgstr "Adres defteri salt okunur durumda"
+#. i18n: don't use html formating in translation
#, php-format
msgid "User \"%s\" already exists"
msgstr "\"%s\" kullanýcýsý zaten var"
+#. i18n: don't use html formating in translation
#, php-format
msgid "User \"%s\" does not exist"
msgstr "\"%s\" kullanýcýsý yok"
@@ -984,6 +991,9 @@ msgstr "Görüntüle"
msgid "View Business Card"
msgstr "Ýþ Kartýný Görüntüle"
+msgid "Your session has expired, but will be resumed after logging in again."
+msgstr ""
+
msgid "Sunday"
msgstr "Pazar"
@@ -1351,9 +1361,11 @@ msgstr "Tümünü Býrak"
msgid "Select All"
msgstr "Tümünü Seç"
+#, php-format
msgid "Viewing Messages: %s to %s (%s total)"
msgstr "Görüntülenen Mesajlar: %s ile %s arasý (toplam %s)"
+#, php-format
msgid "Viewing Message: %s (%s total)"
msgstr "Görüntülenen Mesaj: %s (toplam %s)"
@@ -1399,15 +1411,25 @@ msgstr "sec_remove_tr_TR.png"
msgid "This external link will open in a new window"
msgstr "Bu dýþ link yeni bir pencerede açýlacaktýr"
+#, php-format
msgid "Option Type '%s' Not Found"
msgstr "'%s' Seçenek Tipi Bulunamadý"
+#, fuzzy
+msgid "Delete Selected"
+msgstr "Seçili öðeyi sil"
+
+#, fuzzy, php-format
+msgid "Edit List Layout Type '%s' Not Found"
+msgstr "'%s' Seçenek Tipi Bulunamadý"
+
msgid "Current Folder"
msgstr "Görüntülenen Klasör"
msgid "Compose"
msgstr "Mesaj Yaz"
+#, php-format
msgid "Error creating directory %s."
msgstr "%s dizini oluþturulurken hata oluþtu."
@@ -1562,7 +1584,8 @@ msgstr "Baþlýklar ve mesaj gövdesi arasý
msgid "After message body"
msgstr "Mesaj gövdesinden sonra"
-msgid "Addressbook Display Format"
+#, fuzzy
+msgid "Address Book Display Format"
msgstr "Adres Defteri Görünüm Biçimi"
msgid "Javascript"
@@ -1571,15 +1594,26 @@ msgstr "Javascript"
msgid "HTML"
msgstr "HTML"
+msgid "Format of Addresses Added From Address Book"
+msgstr ""
+
+msgid "No prefix/Address only"
+msgstr ""
+
+#, fuzzy
+msgid "Nickname and address"
+msgstr "Ýsim ve Adres Seçenekleri"
+
+#, fuzzy
+msgid "Full name and address"
+msgstr "Ýsim ve Adres Seçenekleri"
+
msgid "Show HTML Version by Default"
msgstr "Varsayýlan olarak HTML Göster"
msgid "Enable Forward as Attachment"
msgstr "Eklenti Olarak Ýlet Seçeneðini Etkinleþtir"
-msgid "Include CCs when Forwarding Messages"
-msgstr "Mesajlarý Ýletirken Cc'leri Silme"
-
msgid "Include Me in CC when I Reply All"
msgstr "Herkese Cevap Yazdýðýmda Beni Cc'ye Ekle"
@@ -1982,6 +2016,12 @@ msgstr "SMTP doðrulama yok"
msgid "Login (plain text)"
msgstr "Login (düz yazý)"
+msgid "Custom SMTP AUTH username"
+msgstr ""
+
+msgid "Custom SMTP AUTH password"
+msgstr ""
+
msgid "POP3 Before SMTP?"
msgstr "SMTP'den Önce POP3"
@@ -2231,6 +2271,10 @@ msgid ""
msgstr ""
"Bu modül SquirrelMail'in ana yapýlandýrmasýný uzaktan yönetmenizi saðlar."
+#, fuzzy
+msgid "Plugin is not enabled"
+msgstr "Eklenti devde dýþý."
+
msgid "Submit a Bug Report"
msgstr "Bir Hata Raporu Gönder"
@@ -2314,7 +2358,8 @@ msgstr "Hata Raporu Formuna Baþla"
msgid "Bug"
msgstr "Hata"
-msgid "Bug Reports:"
+#, fuzzy
+msgid "Bug Reports"
msgstr "Hata Raporlarý:"
msgid "Show button in toolbar"
@@ -2756,7 +2801,8 @@ msgstr "%s bulunamadý."
msgid "Today's Fortune"
msgstr "Günün Falý"
-msgid "Fortunes:"
+#, fuzzy
+msgid "Fortunes"
msgstr "Fallar:"
msgid "Show fortunes at top of mailbox"
@@ -2826,33 +2872,21 @@ msgstr "Liste Sahibi Ýle Temas Kur"
msgid "Mailing List"
msgstr "Mesaj Listesi"
-msgid "POP3 connect:"
-msgstr "POP3 baðlantýsý:"
-
msgid "No server specified"
msgstr "Sunucu tanýmlanmadý"
msgid "Error "
msgstr "Hata "
-msgid "POP3 user:"
-msgstr "POP3 kullanýcýsý:"
-
msgid "no login ID submitted"
msgstr "kullanýcý adý verilmedi"
msgid "connection not established"
msgstr "baðlantý kurulmadý"
-msgid "POP3 pass:"
-msgstr "POP3 þifresi:"
-
msgid "No password submitted"
msgstr "Þifre verilmedi"
-msgid "POP3 apop:"
-msgstr "POP3 apop:"
-
msgid "No connection to server"
msgstr "Sunucuya baðlantý yok"
@@ -2868,45 +2902,15 @@ msgstr "durdur"
msgid "apop authentication failed"
msgstr "apop doðrulamasý baþarýsýz oldu"
-msgid "POP3 login:"
-msgstr "POP3 login:"
-
-msgid "POP3 top:"
-msgstr "POP3 top:"
-
-msgid "POP3 pop_list:"
-msgstr "POP3 pop_list:"
-
msgid "Premature end of list"
msgstr "Prematüre liste sonu"
-msgid "POP3 get:"
-msgstr "POP3 al:"
-
-msgid "POP3 last:"
-msgstr "POP3 son:"
-
-msgid "POP3 reset:"
-msgstr "POP3 reset:"
-
-msgid "POP3 send_cmd:"
-msgstr "POP3 send_cmd:"
-
msgid "Empty command string"
msgstr "Boþ komut giriþi"
-msgid "POP3 quit:"
-msgstr "POP3 çýkýþ:"
-
msgid "connection does not exist"
msgstr "baðlantý mevcut deðil"
-msgid "POP3 uidl:"
-msgstr "POP3 uidl:"
-
-msgid "POP3 delete:"
-msgstr "POP3 sil:"
-
msgid "No msg number submitted"
msgstr "Mesaj numarasý girilmedi"
@@ -3164,12 +3168,11 @@ msgstr ""
msgid "Count only messages that are RECENT"
msgstr "Sadece YENÝ mesajlarý say"
-#, php-format
+#, fuzzy, php-format
msgid ""
"Selecting the %s option will change the title in some browsers to let you "
-"know when you have new mail (requires JavaScript, and only works in IE but "
-"you won't see errors with other browsers). This will always tell you if you "
-"have new mail, even if you have %s enabled."
+"know when you have new mail (requires JavaScript). This will always tell you "
+"if you have new mail, even if you have %s enabled."
msgstr ""
"%s seçeneði bazý tarayýcýlarda yeni mesaj aldýðýnýzý belirtmek için baþlýðýn "
"deðiþmesini saðlar (JavaScript gerektirir ve sadece IE ile çalýþýr fakat "
@@ -3210,6 +3213,17 @@ msgstr "(hiçbiri)"
msgid "requires JavaScript to work"
msgstr "çalýþmak için JavaScript gerektirir"
+#, fuzzy
+msgid "Width of popup window:"
+msgstr "Yazým Penceresinin Geniþliði"
+
+msgid "If set to 0, reverts to default value"
+msgstr ""
+
+#, fuzzy
+msgid "Height of popup window:"
+msgstr "Yazým Penceresinin Yüksekliði"
+
msgid "Try"
msgstr "Dene"
@@ -3546,9 +3560,6 @@ msgstr "Bu, kiþisel sözlük dosyanýzý sil
msgid "Error Decrypting Dictionary"
msgstr "Sözlük Þifresi Çözülürken Hata Oldu"
-msgid "Cute."
-msgstr "Sevimli."
-
#, php-format
msgid "Could not run the spellchecker command (%s)."
msgstr "Yazým kontrol komutu çalýþtýrýlamadý (%s)."
@@ -3838,6 +3849,9 @@ msgstr ""
msgid "SquirrelSpell Initiating"
msgstr "SquirrelSpell Baþlýyor"
+msgid ", "
+msgstr ""
+
#, php-format
msgid "Settings adjusted to: %s with %s as default dictionary."
msgstr "Ayarlar þöyle yapýldý: Varsayýlan sözlük olarak %s ile %s."
@@ -4084,3 +4098,51 @@ msgstr "Daðýtýlmayan Mesaj Baþlýklarý"
msgid "This image has been removed for security reasons"
msgstr "Bu resim güvenlik nedenleriyle kaldýrýlmýþtýr"
+
+#~ msgid "Include CCs when Forwarding Messages"
+#~ msgstr "Mesajlarý Ýletirken Cc'leri Silme"
+
+#~ msgid "POP3 connect:"
+#~ msgstr "POP3 baðlantýsý:"
+
+#~ msgid "POP3 user:"
+#~ msgstr "POP3 kullanýcýsý:"
+
+#~ msgid "POP3 pass:"
+#~ msgstr "POP3 þifresi:"
+
+#~ msgid "POP3 apop:"
+#~ msgstr "POP3 apop:"
+
+#~ msgid "POP3 login:"
+#~ msgstr "POP3 login:"
+
+#~ msgid "POP3 top:"
+#~ msgstr "POP3 top:"
+
+#~ msgid "POP3 pop_list:"
+#~ msgstr "POP3 pop_list:"
+
+#~ msgid "POP3 get:"
+#~ msgstr "POP3 al:"
+
+#~ msgid "POP3 last:"
+#~ msgstr "POP3 son:"
+
+#~ msgid "POP3 reset:"
+#~ msgstr "POP3 reset:"
+
+#~ msgid "POP3 send_cmd:"
+#~ msgstr "POP3 send_cmd:"
+
+#~ msgid "POP3 quit:"
+#~ msgstr "POP3 çýkýþ:"
+
+#~ msgid "POP3 uidl:"
+#~ msgstr "POP3 uidl:"
+
+#~ msgid "POP3 delete:"
+#~ msgstr "POP3 sil:"
+
+#~ msgid "Cute."
+#~ msgstr "Sevimli."
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 14 Dec 2007 22:02:14 -0000 1.21
+++ .cvsignore 1 Oct 2008 13:30:57 -0000 1.22
@@ -1,2 +1,2 @@
-squirrelmail-1.4.13.tar.bz2
-all_locales-1.4.9-20070106.tar.bz2
+squirrelmail-1.4.16.tar.bz2
+all_locales-1.4.13-20071220.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 14 Dec 2007 22:02:14 -0000 1.21
+++ sources 1 Oct 2008 13:30:57 -0000 1.22
@@ -1,2 +1,2 @@
-1a1bdad6245aaabcdd23d9402acb388e squirrelmail-1.4.13.tar.bz2
-eaa0e8835b8d7d451500aad907c22e24 all_locales-1.4.9-20070106.tar.bz2
+22dcf999941e644edc3ea467ed3b9e24 squirrelmail-1.4.16.tar.bz2
+c6463312afcd602ae60fd8f388dfb8c2 all_locales-1.4.13-20071220.tar.bz2
squirrelmail-1.4.6-japanese-multibyte-view-body.patch:
Index: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-9/squirrelmail-1.4.6-japanese-multibyte-view-body.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squirrelmail-1.4.6-japanese-multibyte-view-body.patch 9 Jul 2006 20:50:24 -0000 1.2
+++ squirrelmail-1.4.6-japanese-multibyte-view-body.patch 1 Oct 2008 13:30:57 -0000 1.3
@@ -1,26 +1,26 @@
-diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
---- squirrelmail-1.4.6.org/functions/mime.php 2006-06-29 08:23:58.000000000 +0900
-+++ squirrelmail-1.4.6/functions/mime.php 2006-06-29 08:34:26.000000000 +0900
-@@ -353,8 +353,20 @@ function formatBody($imap_stream, $messa
- $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
+diff -up squirrelmail-1.4.13/functions/mime.php.BAD squirrelmail-1.4.13/functions/mime.php
+--- squirrelmail-1.4.13/functions/mime.php.BAD 2008-09-05 12:24:10.000000000 -0400
++++ squirrelmail-1.4.13/functions/mime.php 2008-09-05 12:24:36.000000000 -0400
+@@ -361,8 +361,20 @@ function formatBody($imap_stream, $messa
+ $body = magicHTML($body, $id, $message, $mailbox);
}
} else {
- translateText($body, $wrap_at,
- $body_message->header->getParameter('charset'));
-+ if($squirrelmail_language != 'ja_JP'){
-+ translateText($body, $wrap_at,
-+ $body_message->header->getParameter('charset'));
-+ } else {
-+ if($body_message->header->encoding == 'base64' ||
-+ $body_message->header->encoding == 'quoted-printable' ||
-+ $body_message->header->encoding == 'quoted_printable'){
-+ translateText($body, $wrap_at, $default_charset);
-+ } else {
-+ // it may never call here.
-+ translateText($body, $wrap_at,
-+ $body_message->header->getParameter('charset'));
-+ }
-+ }
++ if($squirrelmail_language != 'ja_JP'){
++ translateText($body, $wrap_at,
++ $body_message->header->getParameter('charset'));
++ } else {
++ if($body_message->header->encoding == 'base64' ||
++ $body_message->header->encoding == 'quoted-printable' ||
++ $body_message->header->encoding == 'quoted_printable'){
++ translateText($body, $wrap_at, $default_charset);
++ } else {
++ // it may never call here.
++ translateText($body, $wrap_at,
++ $body_message->header->getParameter('charset'));
++ }
++ }
}
// if this is the clean display (i.e. printer friendly), stop here.
squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
Index: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-9/squirrelmail-1.4.6-japanese-multibyte-view-text.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- squirrelmail-1.4.6-japanese-multibyte-view-text.patch 17 Apr 2007 16:52:44 -0000 1.3
+++ squirrelmail-1.4.6-japanese-multibyte-view-text.patch 1 Oct 2008 13:30:57 -0000 1.4
@@ -1,17 +1,16 @@
-diff -ruNp squirrelmail-1.4.6.org/src/view_text.php squirrelmail-1.4.6/src/view_text.php
---- squirrelmail-1.4.6.org/src/view_text.php 2006-02-04 07:27:55.000000000 +0900
-+++ squirrelmail-1.4.6/src/view_text.php 2006-06-29 08:30:04.000000000 +0900
-@@ -81,7 +81,17 @@ if ($type1 == 'html' || (isset($override
- if (! empty($charset))
- $body = charset_decode($charset,$body,false,true);
+diff -up squirrelmail-1.4.13/src/view_text.php.BAD squirrelmail-1.4.13/src/view_text.php
+--- squirrelmail-1.4.13/src/view_text.php.BAD 2008-09-05 12:22:02.000000000 -0400
++++ squirrelmail-1.4.13/src/view_text.php 2008-09-05 12:23:20.000000000 -0400
+@@ -84,7 +84,17 @@ if ($type1 == 'html' || (isset($override
+ $body = magicHTML( $body, $passed_id, $message, $mailbox);
} else {
$ishtml = FALSE;
- translateText($body, $wrap_at, $charset);
+ if($squirrelmail_language != 'ja_JP'){
+ translateText($body, $wrap_at, $charset);
+ } else {
-+ if($encoding == 'base64' || $encoding == 'quoted-printable' ||
-+ $encoding == 'quoted_printable'){
++ if($encoding == 'base64' || $encoding == 'quoted-printable' ||
++ $encoding == 'quoted_printable'){
+ translateText($body, $wrap_at, $default_charset);
+ } else {
+ // it may never call here.
Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-9/squirrelmail.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- squirrelmail.spec 14 Dec 2007 22:02:14 -0000 1.56
+++ squirrelmail.spec 1 Oct 2008 13:30:57 -0000 1.57
@@ -5,23 +5,25 @@
Summary: SquirrelMail webmail client
Name: squirrelmail
-Version: 1.4.13
+Version: 1.4.16
Release: 1%{?dist}
-License: GPL
+License: GPLv2+
URL: http://www.squirrelmail.org/
Group: Applications/Internet
Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
Source1: squirrelmail.conf
Source2: squirrelmail-splash-fedora.png
Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.9-2007010...
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.13-200712...
Source5: config_local.php
Patch1: squirrelmail-1.4.6-zenkaku-subject-convert.patch
#Patch2: squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
Patch3: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
Patch4: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
#Patch5: squirrelmail-1.4.7-ja-translate.patch
-Patch6: squirrelmail-1.4.9a-id_plural.patch
+#Patch6: squirrelmail-1.4.9a-id_plural.patch
+# Taken from upstream
+Patch7: squirrelmail-1.4.15-tr-fix.patch
# CVE-2006-6142
#Patch100: squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
#Patch101: squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
@@ -57,7 +59,8 @@
mkdir locale_tempdir
cd locale_tempdir
tar xfj %SOURCE4
-%patch6 -p2
+#%patch6 -p2
+%patch7 -p2
%build
rm -f plugins/make_archive.pl
@@ -258,6 +261,10 @@
%{_sysconfdir}/cron.daily/squirrelmail.cron
%changelog
+* Wed Oct 1 2008 Michal Hlavinka <mhlavink(a)redhat.com> - 1.4.16-1
+- update to 1.4.16
+- resolves: #464185: CVE-2008-3663 Squirrelmail session hijacking
+
* Fri Dec 14 2007 Kevin Fenzi <kevin(a)tummy.com> - 1.4.13-1
- upgrade to new upstream 1.4.13
- note that this package was never vulnerable to CVE-2007-6348
13 years, 7 months