July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit dbus-1 for openSUSE:11.4:Update
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package dbus-1 for openSUSE:11.4:Update checked in at 2012-07-24 16:48:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:11.4:Update/dbus-1 (Old) and /work/SRC/openSUSE:11.4:Update/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1", Maintainer is "THoenig(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.gIrsER/_old 2012-07-24 17:28:03.000000000 +0200 +++ /var/tmp/diff_new_pack.gIrsER/_new 2012-07-24 17:28:03.000000000 +0200 @@ -1,8 +1 @@ -<link package="dbus-1.import4962" cicount="copy"> -<patches> -  -  -  -  -</patches> -</link> +<link package='dbus-1.637' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2012-07-24 16:18:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2012-06-26 20:06:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2012-07-24 17:28:00.000000000 +0200 @@ -1,0 +2,67 @@ +Tue Jul 17 15:13:06 UTC 2012 - pcerny(a)suse.com + +- Patch #281 - 2012/06/26 + * remove "$(srcdir)/" from install-icon rule to fix builds when + --srcdir configuration option is used. + * fix for configure script's search for icon file when it is + not found in the current directory, e.g., when building out + of tree (patch by Thierry Reding). + * undo the XK_Home / XK_End change from patch #280 which broke + the non-VT220 keyboard for those keys (report by H Merijn + Brand). +- Patch #280 - 2012/06/24 + * add configure check to work around warning from + desktop-file-install for "Encoding", noting that it emits + deprecation warnings without providing its version + information. + * add configure option --with-icon-theme to tell xterm whether + to install into an icon theme, defaulting to "hicolor" + (Redhat #755206, #799614 and #804279). + * change --with-icondir to look for "icons" directory rather + than "pixmaps" by default. Add new option --with-pixmapdir to + allow these two uses to be installed concurrently. + * modify configure options --with-app-defaults and + --with-icondir to accept "auto" as value to look for existing + directory from well-known locations. + * add missing codes for secondary DA response which tell the + type of terminal as in the primary DA response. + * update primary DA response for VT420 to include user windows + and horizontal scrolling. + * add modifyKeyboard resource to support keypad-modifier + changes per request by Thomas Wolff. + * add XK_Home / XK_End to editing-keypad checks + * add back-tab key kB to termcap entries to match the terminfo. + * update terminfo to match corresponding entries in ncurses, + e.g., add XT and adjust sgr string for xterm-bold entry. + * add configure options to predefine the most commonly + customized resources for terminal-settings, use those to + substitute into the manpage the corresponding compiled-in + values: altSendsEscape, backarrowKey, backarrowKeyIsErase, + deleteIsDEL, metaSendsEscape (Redhat #819588). + * change default emulation level to VT420 (discussion with + Ailin Nemui). + * improve logic for DECSCL; patch 279 partly enforced + limitation of this to higher-level emulations. This patch + finishes that change. + * improve check for base of combining characters, preventing + combination when cursor movement has intervened. Mosh's + webpage gives two different examples of this, with other + causes ascribed to the behavior. + * modify IL/DL to set cursor to first column on row for better + VT102/VT220 compatibility (prompted by code review of mosh). + * separate state-table entries for DECSC/DECRC from the + ANSI.SYS save/restore cursor, since the latter conflicts with + DECSLRM when DECLRMM is enabled since patch #279 + (report/analysis by Ailin Nemui). + * fixes to avoid using SIGCHLD handler of main program in + printer's subprocess (report by Joe Julian). + * correct restore-parameter for mouse-modes from patch #279 + changes. + * add null-pointer checks to input-method caching added in + patch #277 to fix a problem in the exposure code, when + deselecting a window (report by Kriston Rehberg). + * unset DESKTOP_STARTUP_ID environment variable to lessen + confusion on the part of GTK applications which use the + variable without checking it (report by John Little). + +------------------------------------------------------------------- Old: ---- xterm-279.tgz xterm-279.tgz.asc New: ---- xterm-281.tgz xterm-281.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.adpwNl/_old 2012-07-24 17:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.adpwNl/_new 2012-07-24 17:28:02.000000000 +0200 @@ -44,7 +44,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 279 +Version: 281 Release: 0 Summary: The basic X terminal program License: MIT @@ -114,6 +114,7 @@ --x-includes=/usr/X11R6/include \ --x-libraries=/usr/X11R6/%{_lib} \ %endif + --enable-backarrow-is-erase \ make %{?_smp_mflags} ++++++ p_xterm-settings.diff ++++++ --- /var/tmp/diff_new_pack.adpwNl/_old 2012-07-24 17:28:02.000000000 +0200 +++ /var/tmp/diff_new_pack.adpwNl/_new 2012-07-24 17:28:02.000000000 +0200 @@ -228,15 +228,6 @@ =================================================================== --- xterm-264.orig/xterm.man +++ xterm-264/xterm.man -@@ -1227,7 +1227,7 @@ Application specific resources (e.g., "\ - Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources - together by setting the DECBKM state according to whether the initial value of - \fIstty\fP erase is a backspace (8) or delete (127) character. --The default is \*(``false\*('', which disables this feature. -+The default is \*(``true\*('', which disables this feature. - .TP 8 - .B "fullscreen (\fPclass\fB Fullscreen)" - Specifies whether or not \fIxterm\fP should ask the window manager to @@ -3546,9 +3546,13 @@ It is the XIM server's responsibility to The XIM client must inform the XIM server of the cursor position. For best results, the preedit string must be displayed with a proper font. ++++++ xterm-279.tgz -> xterm-281.tgz ++++++ ++++ 16191 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xemacs-packages for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package xemacs-packages for openSUSE:Factory checked in at 2012-07-24 16:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs-packages (Old) and /work/SRC/openSUSE:Factory/.xemacs-packages.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xemacs-packages", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs-packages/xemacs-packages.changes 2012-07-02 11:21:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xemacs-packages.new/xemacs-packages.changes 2012-07-24 17:27:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 23 15:58:02 UTC 2012 - werner(a)suse.de + +- Make it build with lateswt TeXLive 2012 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs-packages.spec ++++++ --- /var/tmp/diff_new_pack.xvHZdX/_old 2012-07-24 17:27:59.000000000 +0200 +++ /var/tmp/diff_new_pack.xvHZdX/_new 2012-07-24 17:27:59.000000000 +0200 @@ -42,6 +42,10 @@ BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel %endif +%if %suse_version > 1220 +BuildRequires: makeinfo +BuildRequires: texinfo +%endif Url: http://www.xemacs.org Provides: xemacs:%{_datadir}/xemacs/xemacs-packages/etc/auctex/style/amsart.elc Obsoletes: Mule-UCS-xemacs -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark for openSUSE:12.2
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package wireshark for openSUSE:12.2 checked in at 2012-07-24 16:14:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/wireshark (Old) and /work/SRC/openSUSE:12.2/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark", Maintainer is "BJZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/wireshark/wireshark.changes 2012-06-25 15:57:33.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.wireshark.new/wireshark.changes 2012-07-24 17:23:01.000000000 +0200 @@ -1,0 +2,47 @@ +Tue Jul 24 05:00:53 UTC 2012 - andreas.stieger(a)gmx.de + +- update to upstream 1.8.1 (bnc#772738) + + vulnerabilities fixed: + * The PPP dissector could crash + (wnpa-sec-2012-11 CVE-2012-4048) + * The NFS dissector could use excessive amounts of CPU + (wnpa-sec-2012-12 CVE-2012-4049) + + bug fixes: + * Wireshark crashes on bootp filter + * Wireshark > 1.4 does not correctly read Association ID for PS + Poll packets + * Radius-EAP broken since 1.8.0 release + * SNMP incorrectly marks SNMPv3 "discovery" packet as malformed + * Widgets are not properly expanded in GTK3 + * Find Next Mark duplicated on Edit Menu + * DVB-CI/CI+: fix offset error in operator_info apdu + * Unable to correctly identify IEC 61850 MMS packets + * WinPcap doesn't install if vcredist_x64 requires reboot +- remove wireshark-1.8.0-gmodule.patch, fixed upstream + +------------------------------------------------------------------- +Fri Jun 22 21:13:23 UTC 2012 - andreas.stieger(a)gmx.de + +- update to upstream 1.8.0: + * supports capturing from multiple interfaces at once. + * add, edit, and save packet and capture file annotations. + * pcap-ng file format is default + * Decryption key management for IEEE 802.11, IPsec, and ISAKMP + is easier. + * GeoIP IPv6 databases are now supported. + * large number of protocol dissectors added and updated + * support for many capture file formats added and updated + + For a full list refer to the release notes: + https://www.wireshark.org/docs/relnotes/wireshark-1.8.0.html + +- drop wireshark-corosync-packet-dissector.patch, no longer compiles + even after updating +- drop wireshark-1.6.5-netlogon-aes.patch, applied upstream +- drop idl2wrs command from -devel package +- update header files in include.filelist +- refresh wireshark-1.2.0-disable-warning-dialog.patch +- refresh wireshark-1.2.0-geoip.patch +- add wireshark-1.8.0-gmodule.patch to fix linking in factory + +------------------------------------------------------------------- Old: ---- wireshark-1.6.5-netlogon-aes.patch wireshark-1.6.8.tar.bz2 wireshark-corosync-packet-dissector.patch New: ---- wireshark-1.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.SRIU8L/_old 2012-07-24 17:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SRIU8L/_new 2012-07-24 17:23:01.000000000 +0200 @@ -20,7 +20,7 @@ %define use_caps 0 Name: wireshark -Version: 1.6.8 +Version: 1.8.1 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ @@ -32,11 +32,8 @@ Patch1: %{name}-1.2.0-disable-warning-dialog.patch # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak(a)suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders Patch2: %{name}-1.2.0-geoip.patch -# PATCH-FEATURE-UPSTREAM wireshark-corosync-packet-dissector.patch tserong(a)novell.com -- add corosync packet dissector -Patch3: %{name}-corosync-packet-dissector.patch # PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434 Patch4: %{name}-1.2.4-enable_lua.patch -Patch5: %{name}-1.6.5-netlogon-aes.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -95,9 +92,7 @@ %prep %setup -q %patch2 -%patch3 %patch4 -%patch5 -p1 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 @@ -179,7 +174,5 @@ %dir %{_includedir}/wireshark/wsutil %{_includedir}/wireshark/* %{_libdir}/*.so -%{_bindir}/idl2wrs -%{_mandir}/man1/idl2wrs* %changelog ++++++ include.filelist ++++++ --- /var/tmp/diff_new_pack.SRIU8L/_old 2012-07-24 17:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SRIU8L/_new 2012-07-24 17:23:01.000000000 +0200 @@ -1,8 +1,9 @@ color.h config.h +register.h epan/addr_and_mask.h -epan/addr_resolv.h epan/address.h +epan/addr_resolv.h epan/adler32.h epan/afn.h epan/aftypes.h @@ -19,33 +20,32 @@ epan/chdlctypes.h epan/circuit.h epan/codecs.h -epan/column-utils.h epan/column.h epan/column_info.h +epan/column-utils.h epan/conversation.h -epan/crc10.h -epan/crc16.h -epan/crc32.h -epan/crc6.h -epan/crc8.h -epan/crcdrm.h +epan/conv_id.h +epan/crc16-tvb.h +epan/crc32-tvb.h +epan/crc8-tvb.h +epan/crypt/aes.h epan/crypt/airpdcap_debug.h -epan/crypt/airpdcap_int.h epan/crypt/airpdcap_interop.h +epan/crypt/airpdcap_int.h epan/crypt/airpdcap_rijndael.h epan/crypt/airpdcap_system.h epan/crypt/airpdcap_user.h epan/crypt/airpdcap_ws.h -epan/crypt/crypt-aes.h -epan/crypt/crypt-des.h -epan/crypt/crypt-md4.h -epan/crypt/crypt-md5.h -epan/crypt/crypt-rc4.h -epan/crypt/crypt-sha1.h +epan/crypt/des.h +epan/crypt/eax.h +epan/crypt/md4.h +epan/crypt/md5.h +epan/crypt/rc4.h +epan/crypt/sha1.h epan/crypt/wep-wpadefs.h +epan/dfilter/dfilter.h epan/dfilter/dfilter-int.h epan/dfilter/dfilter-macro.h -epan/dfilter/dfilter.h epan/dfilter/dfunctions.h epan/dfilter/dfvm.h epan/dfilter/drange.h @@ -60,12 +60,13 @@ epan/diam_dict.h epan/diam_dict_lex.h epan/dissector_filters.h -epan/dissectors/packet-acn.h +epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.h +epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.h +epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.h epan/dissectors/packet-acp133.h epan/dissectors/packet-acse.h epan/dissectors/packet-actrace.h epan/dissectors/packet-afp.h -epan/dissectors/packet-afs.h epan/dissectors/packet-aim.h epan/dissectors/packet-alcap.h epan/dissectors/packet-ansi_a.h @@ -74,30 +75,31 @@ epan/dissectors/packet-ap1394.h epan/dissectors/packet-arcnet.h epan/dissectors/packet-arp.h -epan/dissectors/packet-assa_r3_public.h epan/dissectors/packet-atalk.h epan/dissectors/packet-atm.h epan/dissectors/packet-bacapp.h epan/dissectors/packet-ber.h -epan/dissectors/packet-bgp.h -epan/dissectors/packet-bootparams.h +epan/dissectors/packet-bfd.h epan/dissectors/packet-bssap.h epan/dissectors/packet-bssgp.h epan/dissectors/packet-bthci_acl.h epan/dissectors/packet-btl2cap.h epan/dissectors/packet-btrfcomm.h epan/dissectors/packet-btsdp.h +epan/dissectors/packet-c1222.h epan/dissectors/packet-camel.h epan/dissectors/packet-cdt.h +epan/dissectors/packet-cell_broadcast.h epan/dissectors/packet-charging_ase.h epan/dissectors/packet-chdlc.h -epan/dissectors/packet-cimd.h epan/dissectors/packet-cip.h +epan/dissectors/packet-cipsafety.h epan/dissectors/packet-clearcase.h epan/dissectors/packet-clip.h epan/dissectors/packet-cmip.h epan/dissectors/packet-cmp.h epan/dissectors/packet-cms.h +epan/dissectors/packet-credssp.h epan/dissectors/packet-crmf.h epan/dissectors/packet-csn1.h epan/dissectors/packet-dap.h @@ -119,9 +121,11 @@ epan/dissectors/packet-dcerpc-frsapi.h epan/dissectors/packet-dcerpc-frsrpc.h epan/dissectors/packet-dcerpc-frstrans.h +epan/dissectors/packet-dcerpc.h epan/dissectors/packet-dcerpc-initshutdown.h epan/dissectors/packet-dcerpc-lsa.h epan/dissectors/packet-dcerpc-mapi.h +epan/dissectors/packet-dcerpc-misc.h epan/dissectors/packet-dcerpc-netlogon.h epan/dissectors/packet-dcerpc-nspi.h epan/dissectors/packet-dcerpc-nt.h @@ -136,7 +140,6 @@ epan/dissectors/packet-dcerpc-winreg.h epan/dissectors/packet-dcerpc-wkssvc.h epan/dissectors/packet-dcerpc-wzcsvc.h -epan/dissectors/packet-dcerpc.h epan/dissectors/packet-dcm.h epan/dissectors/packet-dcom-dispatch.h epan/dissectors/packet-dcom.h @@ -158,17 +161,16 @@ epan/dissectors/packet-enc.h epan/dissectors/packet-enip.h epan/dissectors/packet-epmd.h -epan/dissectors/packet-erf.h epan/dissectors/packet-esis.h epan/dissectors/packet-ess.h epan/dissectors/packet-eth.h -epan/dissectors/packet-fc.h epan/dissectors/packet-fcbls.h epan/dissectors/packet-fcct.h epan/dissectors/packet-fcdns.h epan/dissectors/packet-fcels.h epan/dissectors/packet-fcfcs.h epan/dissectors/packet-fcfzs.h +epan/dissectors/packet-fc.h epan/dissectors/packet-fclctl.h epan/dissectors/packet-fcp.h epan/dissectors/packet-fcsb3.h @@ -177,10 +179,12 @@ epan/dissectors/packet-ff.h epan/dissectors/packet-fix.h epan/dissectors/packet-fmp.h -epan/dissectors/packet-fr.h epan/dissectors/packet-frame.h +epan/dissectors/packet-fr.h epan/dissectors/packet-ftam.h epan/dissectors/packet-giop.h +epan/dissectors/packet-gluster.h +epan/dissectors/packet-gmr1_common.h epan/dissectors/packet-gnm.h epan/dissectors/packet-gnutella.h epan/dissectors/packet-gprscdr.h @@ -191,6 +195,7 @@ epan/dissectors/packet-gsm_sms.h epan/dissectors/packet-gssapi.h epan/dissectors/packet-gtp.h +epan/dissectors/packet-gtpv2.h epan/dissectors/packet-h223.h epan/dissectors/packet-h225.h epan/dissectors/packet-h235.h @@ -202,6 +207,7 @@ epan/dissectors/packet-h450-ros.h epan/dissectors/packet-hci_h4.h epan/dissectors/packet-hclnfsd.h +epan/dissectors/packet-hdcp.h epan/dissectors/packet-hpext.h epan/dissectors/packet-http.h epan/dissectors/packet-i2c.h @@ -210,6 +216,9 @@ epan/dissectors/packet-idmp.h epan/dissectors/packet-idp.h epan/dissectors/packet-ieee80211.h +epan/dissectors/packet-ieee80211-radiotap-defs.h +epan/dissectors/packet-ieee80211-radiotap.h +epan/dissectors/packet-ieee80211-radiotap-iter.h epan/dissectors/packet-ieee802154.h epan/dissectors/packet-ieee8021ah.h epan/dissectors/packet-ieee8023.h @@ -219,35 +228,39 @@ epan/dissectors/packet-imf.h epan/dissectors/packet-inap.h epan/dissectors/packet-infiniband.h -epan/dissectors/packet-ip.h -epan/dissectors/packet-ipdc.h epan/dissectors/packet-ipfc.h +epan/dissectors/packet-ip.h epan/dissectors/packet-ipmi.h epan/dissectors/packet-ipsec.h epan/dissectors/packet-ipv6.h epan/dissectors/packet-ipx.h epan/dissectors/packet-isakmp.h epan/dissectors/packet-isis-clv.h +epan/dissectors/packet-isis.h epan/dissectors/packet-isis-hello.h epan/dissectors/packet-isis-lsp.h epan/dissectors/packet-isis-snp.h -epan/dissectors/packet-isis.h epan/dissectors/packet-isl.h epan/dissectors/packet-isup.h epan/dissectors/packet-jxta.h epan/dissectors/packet-kerberos.h epan/dissectors/packet-klm.h +epan/dissectors/packet-lcsap.h epan/dissectors/packet-ldap.h epan/dissectors/packet-ldp.h epan/dissectors/packet-llc.h +epan/dissectors/packet-lldp.h epan/dissectors/packet-logotypecertextn.h +epan/dissectors/packet-lpp.h epan/dissectors/packet-lte-rrc.h epan/dissectors/packet-mac-lte.h -epan/dissectors/packet-meta.h +epan/dissectors/packet-mbtcp.h epan/dissectors/packet-mgcp.h epan/dissectors/packet-mms.h epan/dissectors/packet-mount.h epan/dissectors/packet-mp4ves.h +epan/dissectors/packet-mpeg-descriptor.h +epan/dissectors/packet-mpeg-sect.h epan/dissectors/packet-mpls.h epan/dissectors/packet-mq.h epan/dissectors/packet-mrdisc.h @@ -269,19 +282,18 @@ epan/dissectors/packet-ntp.h epan/dissectors/packet-null.h epan/dissectors/packet-ocsp.h -epan/dissectors/packet-osi-options.h epan/dissectors/packet-osi.h +epan/dissectors/packet-osi-options.h epan/dissectors/packet-p1.h epan/dissectors/packet-p22.h -epan/dissectors/packet-p7.h epan/dissectors/packet-p772.h +epan/dissectors/packet-p7.h epan/dissectors/packet-pcnfsd.h epan/dissectors/packet-pdcp-lte.h epan/dissectors/packet-per.h -epan/dissectors/packet-pflog.h epan/dissectors/packet-pim.h -epan/dissectors/packet-pkcs1.h epan/dissectors/packet-pkcs12.h +epan/dissectors/packet-pkcs1.h epan/dissectors/packet-pkinit.h epan/dissectors/packet-pkix1explicit.h epan/dissectors/packet-pkix1implicit.h @@ -301,22 +313,21 @@ epan/dissectors/packet-q931.h epan/dissectors/packet-q932.h epan/dissectors/packet-qsig.h -epan/dissectors/packet-radiotap-defs.h -epan/dissectors/packet-radiotap-iter.h -epan/dissectors/packet-radiotap.h epan/dissectors/packet-radius.h epan/dissectors/packet-ranap.h epan/dissectors/packet-raw.h epan/dissectors/packet-rdt.h +epan/dissectors/packet-reload.h epan/dissectors/packet-rgmp.h -epan/dissectors/packet-rlc-lte.h epan/dissectors/packet-rlc.h +epan/dissectors/packet-rlc-lte.h epan/dissectors/packet-rmi.h epan/dissectors/packet-rmt-alc.h epan/dissectors/packet-rmt-common.h epan/dissectors/packet-rmt-fec.h epan/dissectors/packet-rmt-lct.h epan/dissectors/packet-rmt-norm.h +epan/dissectors/packet-rohc.h epan/dissectors/packet-ros.h epan/dissectors/packet-rpc.h epan/dissectors/packet-rquota.h @@ -325,42 +336,44 @@ epan/dissectors/packet-rtcp.h epan/dissectors/packet-rtp-events.h epan/dissectors/packet-rtp.h -epan/dissectors/packet-rtps.h epan/dissectors/packet-rtps2.h +epan/dissectors/packet-rtps.h epan/dissectors/packet-rtse.h +epan/dissectors/packet-rtsp.h epan/dissectors/packet-rwall.h epan/dissectors/packet-rx.h epan/dissectors/packet-s1ap.h epan/dissectors/packet-sccp.h +epan/dissectors/packet-scsi.h epan/dissectors/packet-scsi-mmc.h epan/dissectors/packet-scsi-osd.h epan/dissectors/packet-scsi-sbc.h epan/dissectors/packet-scsi-smc.h epan/dissectors/packet-scsi-ssc.h -epan/dissectors/packet-scsi.h epan/dissectors/packet-sctp.h epan/dissectors/packet-sdp.h epan/dissectors/packet-ses.h epan/dissectors/packet-sip.h epan/dissectors/packet-skinny.h epan/dissectors/packet-sll.h +epan/dissectors/packet-smb2.h epan/dissectors/packet-smb-browse.h epan/dissectors/packet-smb-common.h +epan/dissectors/packet-smb.h epan/dissectors/packet-smb-mailslot.h epan/dissectors/packet-smb-pipe.h epan/dissectors/packet-smb-sidsnooping.h -epan/dissectors/packet-smb.h -epan/dissectors/packet-smb2.h epan/dissectors/packet-smpp.h epan/dissectors/packet-smrse.h epan/dissectors/packet-snmp.h epan/dissectors/packet-spray.h epan/dissectors/packet-sscop.h -epan/dissectors/packet-ssl-utils.h epan/dissectors/packet-ssl.h -epan/dissectors/packet-stat-notify.h +epan/dissectors/packet-ssl-utils.h epan/dissectors/packet-stat.h +epan/dissectors/packet-stat-notify.h epan/dissectors/packet-sv.h +epan/dissectors/packet-t124.h epan/dissectors/packet-t30.h epan/dissectors/packet-t38.h epan/dissectors/packet-tacacs.h @@ -373,12 +386,15 @@ epan/dissectors/packet-tpkt.h epan/dissectors/packet-tr.h epan/dissectors/packet-tte.h +epan/dissectors/packet-ua.h +epan/dissectors/packet-uaudp.h epan/dissectors/packet-udp.h epan/dissectors/packet-umts_fp.h epan/dissectors/packet-umts_mac.h -epan/dissectors/packet-usb-hid.h epan/dissectors/packet-usb.h +epan/dissectors/packet-usb-hid.h epan/dissectors/packet-vines.h +epan/dissectors/packet-vlan.h epan/dissectors/packet-wap.h epan/dissectors/packet-wccp.h epan/dissectors/packet-wifi-p2p.h @@ -388,25 +404,38 @@ epan/dissectors/packet-wsp.h epan/dissectors/packet-wtls.h epan/dissectors/packet-wtp.h -epan/dissectors/packet-x11-keysym.h epan/dissectors/packet-x11-keysymdef.h +epan/dissectors/packet-x11-keysym.h epan/dissectors/packet-x509af.h epan/dissectors/packet-x509ce.h epan/dissectors/packet-x509if.h epan/dissectors/packet-x509sat.h epan/dissectors/packet-xml.h +epan/dissectors/packet-xmpp-conference.h +epan/dissectors/packet-xmpp-core.h +epan/dissectors/packet-xmpp-gtalk.h +epan/dissectors/packet-xmpp.h +epan/dissectors/packet-xmpp-jingle.h +epan/dissectors/packet-xmpp-other.h +epan/dissectors/packet-xmpp-utils.h epan/dissectors/packet-ypbind.h epan/dissectors/packet-yppasswd.h epan/dissectors/packet-ypserv.h epan/dissectors/packet-ypxfr.h epan/dissectors/packet-zbee-aps.h +epan/dissectors/packet-zbee.h epan/dissectors/packet-zbee-nwk.h epan/dissectors/packet-zbee-security.h epan/dissectors/packet-zbee-zcl.h epan/dissectors/packet-zbee-zdp.h -epan/dissectors/packet-zbee.h epan/dissectors/packet-zep.h epan/dissectors/packet-ziop.h +epan/dissectors/pidl/idl_types.h +epan/dissectors/pidl/mapi/mapicodes_enum.h +epan/dissectors/pidl/mapi/mapitags_enum.h +epan/dissectors/pidl/nspi/mapicodes_enum.h +epan/dissectors/pidl/nspi/mapitags_enum.h +epan/dissectors/pidl/rfr/mapicodes_enum.h epan/dissectors/rpc_defrag.h epan/dissectors/x11-declarations.h epan/dissectors/x11-enum.h @@ -414,28 +443,28 @@ epan/dissectors/x11-extension-implementation.h epan/dissectors/x11-glx-render-enum.h epan/dissectors/x11-register-info.h -epan/dtd.h epan/dtd_grammar.h +epan/dtd.h epan/dtd_parse.h epan/dtd_parse_lex.h epan/dtd_preparse_lex.h epan/eap.h epan/emem.h -epan/epan.h epan/epan_dissect.h +epan/epan.h epan/etypes.h -epan/ex-opt.h epan/except.h epan/exceptions.h +epan/ex-opt.h epan/expert.h epan/filesystem.h +epan/filter_expressions.h epan/follow.h epan/frame_data.h epan/frequency-utils.h -epan/ftypes/ftypes-int.h epan/ftypes/ftypes.h +epan/ftypes/ftypes-int.h epan/funnel.h -epan/g_gnuc.h epan/garrayfix.h epan/gcp.h epan/geoip_db.h @@ -460,11 +489,12 @@ epan/oui.h epan/packet.h epan/packet_info.h +epan/params.h epan/pint.h epan/plugins.h epan/ppptypes.h -epan/prefs-int.h epan/prefs.h +epan/prefs-int.h epan/proto.h epan/ptvcursor.h epan/radius_dict_lex.h @@ -475,8 +505,8 @@ epan/req_resp_hdrs.h epan/rtp_pt.h epan/sctpppids.h -epan/sigcomp-udvm.h epan/sigcomp_state_hdlr.h +epan/sigcomp-udvm.h epan/slab.h epan/sminmpec.h epan/sna-utils.h @@ -486,8 +516,8 @@ epan/stream.h epan/strutil.h epan/t35.h -epan/tap-voip.h epan/tap.h +epan/tap-voip.h epan/tcap-persistentdata.h epan/tfs.h epan/time_fmt.h @@ -495,13 +525,19 @@ epan/to_str.h epan/tvbparse.h epan/tvbuff.h -epan/uat-int.h +epan/tvbuff-int.h epan/uat.h +epan/uat-int.h epan/uat_load_lex.h epan/value_string.h +epan/wslua/declare_wslua.h +epan/wslua/wslua.h +epan/wspython/wspy_proto.h +epan/wspython/wspy_register.h epan/x264_prt_id.h epan/xdlc.h wiretap/5views.h +wiretap/aethra.h wiretap/airopeek9.h wiretap/ascend.h wiretap/ascend-int.h @@ -523,16 +559,17 @@ wiretap/eyesdn.h wiretap/file_wrappers.h wiretap/hcidump.h -wiretap/i4btrace.h wiretap/i4b_trace.h +wiretap/i4btrace.h wiretap/ipfix.h wiretap/iptrace.h wiretap/iseries.h -wiretap/jpeg_jfif.h wiretap/k12.h wiretap/k12text_lex.h wiretap/lanalyzer.h wiretap/libpcap.h +wiretap/mime_file.h +wiretap/mp2t.h wiretap/mpeg.h wiretap/netmon.h wiretap/netscaler.h @@ -552,8 +589,16 @@ wiretap/toshiba.h wiretap/visual.h wiretap/vms.h +wiretap/vwr.h wiretap/wtap.h wiretap/wtap-int.h +wsutil/crc10.h +wsutil/crc16.h +wsutil/crc16-plain.h +wsutil/crc32.h +wsutil/crc6.h +wsutil/crc8.h +wsutil/crcdrm.h wsutil/file_util.h wsutil/inet_aton.h wsutil/inet_v6defs.h @@ -564,4 +609,4 @@ wsutil/type_util.h wsutil/unicode-utils.h wsutil/wsgetopt.h -register.h +wsutil/wsgetopt_int.h ++++++ wireshark-1.2.0-disable-warning-dialog.patch ++++++ --- /var/tmp/diff_new_pack.SRIU8L/_old 2012-07-24 17:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SRIU8L/_new 2012-07-24 17:23:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- gtk/main.c.orig 2011-11-03 03:42:21.018970202 -0400 -+++ gtk/main.c 2011-11-03 03:45:09.134971896 -0400 -@@ -1382,11 +1382,13 @@ +Index: ui/gtk/main.c +=================================================================== +--- ui/gtk/main.c.orig 2012-06-16 19:38:51.000000000 +0100 ++++ ui/gtk/main.c 2012-06-21 22:17:49.000000000 +0100 +@@ -1400,11 +1400,13 @@ main_colorize_changed(gboolean packet_li static GtkWidget *close_dlg = NULL; @@ -14,7 +16,7 @@ #ifdef _WIN32 static void -@@ -1967,9 +1969,10 @@ +@@ -2082,9 +2084,10 @@ check_and_warn_user_startup(gchar *cf_na #endif { gchar *cur_user, *cur_group; @@ -26,7 +28,7 @@ if (running_with_special_privs() && recent.privs_warn_if_elevated) { cur_user = get_cur_username(); cur_group = get_cur_groupname(); -@@ -1981,6 +1984,7 @@ +@@ -2099,6 +2102,7 @@ check_and_warn_user_startup(gchar *cf_na simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); } ++++++ wireshark-1.2.0-geoip.patch ++++++ --- /var/tmp/diff_new_pack.SRIU8L/_old 2012-07-24 17:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SRIU8L/_new 2012-07-24 17:23:01.000000000 +0200 @@ -1,12 +1,14 @@ ---- epan/geoip_db.c.orig 2011-11-03 03:52:16.118977107 -0400 -+++ epan/geoip_db.c 2011-11-03 03:56:23.711016549 -0400 -@@ -165,6 +165,9 @@ - geoip_dat_scan_dir(geoip_db_paths[i].path); - } - } -+ if (num_geoip_db_paths < 1) { -+ geoip_dat_scan_dir("/var/lib/GeoIP"); -+ } +Index: epan/geoip_db.c +=================================================================== +--- epan/geoip_db.c.orig 2012-06-05 17:33:40.000000000 +0100 ++++ epan/geoip_db.c 2012-06-21 21:55:14.000000000 +0100 +@@ -177,6 +177,9 @@ geoip_db_init(void) { + geoip_dat_scan_dir(geoip_db_paths[i].path); + } + } ++ if (num_geoip_db_paths < 1) { ++ geoip_dat_scan_dir("/var/lib/GeoIP"); ++ } /* add fake databases for latitude and longitude (using "City" in reality) */ { ++++++ wireshark-1.6.8.tar.bz2 -> wireshark-1.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/wireshark/wireshark-1.6.8.tar.bz2 /work/SRC/openSUSE:12.2/.wireshark.new/wireshark-1.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2012-07-24 16:14:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark", Maintainer is "BJZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2012-06-26 17:41:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2012-07-24 17:22:56.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Jul 24 05:00:53 UTC 2012 - andreas.stieger(a)gmx.de + +- update to upstream 1.8.1 (bnc#772738) + + vulnerabilities fixed: + * The PPP dissector could crash + (wnpa-sec-2012-11 CVE-2012-4048) + * The NFS dissector could use excessive amounts of CPU + (wnpa-sec-2012-12 CVE-2012-4049) + + bug fixes: + * Wireshark crashes on bootp filter + * Wireshark > 1.4 does not correctly read Association ID for PS + Poll packets + * Radius-EAP broken since 1.8.0 release + * SNMP incorrectly marks SNMPv3 "discovery" packet as malformed + * Widgets are not properly expanded in GTK3 + * Find Next Mark duplicated on Edit Menu + * DVB-CI/CI+: fix offset error in operator_info apdu + * Unable to correctly identify IEC 61850 MMS packets + * WinPcap doesn't install if vcredist_x64 requires reboot +- remove wireshark-1.8.0-gmodule.patch, fixed upstream + +------------------------------------------------------------------- Old: ---- wireshark-1.8.0-gmodule.patch wireshark-1.8.0.tar.bz2 New: ---- wireshark-1.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.OP4Ohj/_old 2012-07-24 17:22:59.000000000 +0200 +++ /var/tmp/diff_new_pack.OP4Ohj/_new 2012-07-24 17:22:59.000000000 +0200 @@ -20,7 +20,7 @@ %define use_caps 0 Name: wireshark -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0+ @@ -34,8 +34,6 @@ Patch2: %{name}-1.2.0-geoip.patch # PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434 Patch4: %{name}-1.2.4-enable_lua.patch -# PATCH-FIX-OPENSUSE wireshark-1.8.0-gmodule.patch andreas.stieger(a)gmx.de -- fix "undefined reference to symbol 'g_module_name'" when linking -Patch5: wireshark-1.8.0-gmodule.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -95,7 +93,6 @@ %setup -q %patch2 %patch4 -%patch5 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 ++++++ wireshark-1.8.0.tar.bz2 -> wireshark-1.8.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wireshark/wireshark-1.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.wireshark.new/wireshark-1.8.1.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit viewvc for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package viewvc for openSUSE:Factory checked in at 2012-07-24 16:14:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/viewvc (Old) and /work/SRC/openSUSE:Factory/.viewvc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "viewvc", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/viewvc/viewvc.changes 2011-09-23 12:49:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.viewvc.new/viewvc.changes 2012-07-24 17:22:52.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Jun 25 11:46:02 UTC 2012 - dmueller(a)suse.com + +- update to 1.1.15 (bnc#768680): + * security fix: complete authz support for remote SVN views (CVE-2012-3356) + * security fix: log msg leak in SVN revision view with unreadable copy source (CVE-2012-3357) + * fix several instances of incorrect information in remote SVN views + * increase performance of some revision metadata lookups in remote SVN views + * fix RSS feed regression introduced in 1.1.14 + * fix annotation of svn files with non-URI-safe paths + * handle file:/// Subversion rootpaths as local roots + * fix bug caused by trying to case-normalize anon usernames + * speed up log handling by reusing tokenization results + * add support for custom review log markup rules + * fix svndbadmin failure on deleted paths under Subversion 1.7 + * fix annotation of files in svn roots with non-URI-safe paths + * fix stray annotation warning in markup display of images + * more gracefully handle attempts to display binary content + * fix path display in patch and certain diff views + * fix broken cvsdb glob searching + * allow svn revision specifiers to have leading r's + * allow environmental override of configuration location + * fix exception HTML-escaping non-string data under WSGI + * add links to root logs from roots view + * use Pygments lexer-guessing functionality + +------------------------------------------------------------------- Old: ---- viewvc-1.1.11.tar.bz2 New: ---- viewvc-1.1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ viewvc.spec ++++++ --- /var/tmp/diff_new_pack.mdIX7I/_old 2012-07-24 17:22:55.000000000 +0200 +++ /var/tmp/diff_new_pack.mdIX7I/_new 2012-07-24 17:22:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package viewvc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: viewvc -BuildRequires: apache2-devel python-devel -Version: 1.1.11 -Release: 2 +BuildRequires: apache2-devel +BuildRequires: python-devel +Version: 1.1.15 +Release: 0 # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -36,14 +35,13 @@ Obsoletes: subversion-viewcvs < %{version} Obsoletes: viewcvs < %{version} Supplements: packageand(subversion-server:apache2) -Group: Development/Tools/Version Control Url: http://www.viewvc.org/ Summary: Browse a Subversion Repository with a Web Browser +License: BSD-3-Clause +Group: Development/Tools/Version Control # BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: BSD-3-Clause -# http://www.viewvc.org/viewvc-%{version}.tar.gz -Source0: viewvc-%{version}.tar.bz2 +Source0: http://www.viewvc.org/viewvc-%{version}.tar.gz Source1: viewvc.conf Source99: viewvc-rpmlintrc Patch0: viewvc-buglink.patch ++++++ viewvc-buglink.patch ++++++ --- /var/tmp/diff_new_pack.mdIX7I/_old 2012-07-24 17:22:55.000000000 +0200 +++ /var/tmp/diff_new_pack.mdIX7I/_new 2012-07-24 17:22:55.000000000 +0200 @@ -1,6 +1,6 @@ ---- conf/viewvc.conf.dist.orig 2011-02-18 19:28:55.000000000 +0100 -+++ conf/viewvc.conf.dist 2011-02-19 01:46:36.000000000 +0100 -@@ -323,6 +323,21 @@ +--- conf/viewvc.conf.dist ++++ conf/viewvc.conf.dist +@@ -329,6 +329,21 @@ ##--------------------------------------------------------------------------- [options] @@ -22,12 +22,22 @@ ## root_as_url_component: Interpret the first path component in the URL ## after the script location as the root to use. This is an ## alternative to using the "root=" query key. If ViewVC is configured ---- lib/viewvc.py.orig 2011-02-18 20:43:26.000000000 +0100 -+++ lib/viewvc.py 2011-02-19 01:46:36.000000000 +0100 -@@ -1100,6 +1100,10 @@ - # Matches revision references - _re_rewrite_svnrevref = re.compile(r'\b(r|rev #?|revision #?)([0-9]+)\b') +--- lib/config.py ++++ lib/config.py +@@ -438,6 +438,7 @@ + self.options.log_pagesize = 0 + self.options.log_pagesextra = 3 + self.options.limit_changes = 100 ++ self.options.buglink_base = None + + self.templates.diff = None + self.templates.directory = None +--- lib/viewvc.py ++++ lib/viewvc.py +@@ -1122,6 +1122,10 @@ + return out, out_len, 0 + +# Matches bug numbers +_re_rewrite_bug = re.compile(r'((?:\bbug[\s:#+]|[^&]#|^#)\s*(\d\d+))', re.I) +_re_buglink_prefix = "" @@ -35,7 +45,7 @@ class ViewVCHtmlFormatter: """Format a string as HTML-encoded output with customizable markup rules, for example turning strings that look like URLs into anchor links. -@@ -1112,6 +1116,19 @@ +@@ -1134,6 +1138,19 @@ def __init__(self): self._formatters = [] @@ -55,24 +65,15 @@ def format_url(self, mobj, userdata, maxlen=0): """Return a 2-tuple containing: - the text represented by MatchObject MOBJ, formatted as -@@ -1289,6 +1306,10 @@ - escape=1) - lf.add_formatter(_re_rewrite_svnrevref, lf.format_svnrevref, - revision_to_url) -+ if cfg.options.buglink_base is not None: -+ global _re_buglink_prefix -+ _re_buglink_prefix = cfg.options.buglink_base -+ lf.add_formatter(_re_rewrite_bug, lf.format_bugzilla); - if cfg.options.mangle_email_addresses == 2: - lf.add_formatter(_re_rewrite_email, lf.format_email_truncated) - elif cfg.options.mangle_email_addresses == 1: ---- lib/config.py.orig 2011-02-18 20:27:50.000000000 +0100 -+++ lib/config.py 2011-02-19 01:46:56.000000000 +0100 -@@ -436,6 +436,7 @@ - self.options.log_pagesize = 0 - self.options.log_pagesextra = 3 - self.options.limit_changes = 100 -+ self.options.buglink_base = None +@@ -1356,6 +1373,11 @@ + lf.add_formatter(_re_rewrite_svnrevref, lf.format_svnrevref, + revision_to_url) - self.templates.diff = None - self.templates.directory = None ++ if cfg.options.buglink_base is not None: ++ global _re_buglink_prefix ++ _re_buglink_prefix = cfg.options.buglink_base ++ lf.add_formatter(_re_rewrite_bug, lf.format_bugzilla) ++ + # Rewrite email addresses. + if cfg.options.mangle_email_addresses == 2: + lf.add_formatter(_re_rewrite_email, lf.format_email_truncated) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit u-boot for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2012-07-24 16:16:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "u-boot", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-07-06 19:40:38.919402255 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-omap3beagle.changes 2012-07-24 17:22:44.000000000 +0200 @@ -0,0 +1,136 @@ +------------------------------------------------------------------- +Thu Jul 12 08:12:15 UTC 2012 - agraf(a)suse.com + +- update to upstream u-boot 2012.04 + -> gets rid of linaro fork, only mainline now + -> gets us omap3 MLO support, no more need for x-loader + -> potentially fixes voltage issues on omap4 + +------------------------------------------------------------------- +Thu Jun 14 09:04:53 UTC 2012 - adrian(a)suse.de + +- add SUSE style conflicts to avoid installation of multiple + boot loaders + +------------------------------------------------------------------- +Tue Apr 17 11:59:55 UTC 2012 - joop.boonen(a)opensuse.org + +- Included u-boot.spec.in and gen_spec.sh in the spec file + +------------------------------------------------------------------- +Mon Feb 6 13:25:09 UTC 2012 - agraf(a)suse.com + +- use ext2 on panda + +------------------------------------------------------------------- +Tue Dec 20 02:36:05 UTC 2011 - agraf(a)suse.com + +- use ttyO2 as default console= on OMAP boards + +------------------------------------------------------------------- +Mon Dec 19 20:21:21 UTC 2011 - agraf(a)suse.com + +- add u8500_href and origen configs + +------------------------------------------------------------------- +Fri Dec 16 16:03:01 UTC 2011 - agraf(a)suse.com + +- fix lint failures + +------------------------------------------------------------------- +Fri Dec 16 14:46:53 CET 2011 - agraf(a)suse.com + +- don't install map + +------------------------------------------------------------------- +Fri Dec 16 02:16:19 UTC 2011 - agraf(a)suse.com + +- generalize spec file to be able to build for more boards +- add beagle board spec file +- remove boot.scr + +------------------------------------------------------------------- +Fri Dec 16 01:15:47 UTC 2011 - agraf(a)suse.com + +- rename to u-boot-omap4panda + +------------------------------------------------------------------- +Tue Dec 13 17:24:45 UTC 2011 - dkukawka(a)suse.de + +- new package based on u-boot-omap4panda but use linaro u-boot git + repo (http://git.linaro.org/git/boot/u-boot-linaro-stable.git) + instead of mainline u-boot. This package also contains the MLO + (this package obsoletes the x-loader package) + +------------------------------------------------------------------- +Tue Nov 29 22:53:44 UTC 2011 - joop.boonen(a)opensuse.org + +- COPYING CREDITS README are now in the standard package + +------------------------------------------------------------------- +Thu Nov 24 21:08:58 UTC 2011 - joop.boonen(a)opensuse.org + +- Corrected the links + +------------------------------------------------------------------- +Tue Nov 22 17:47:17 UTC 2011 - joop.boonen(a)opensuse.org + +- Build without u-boot tools as we have a u-boot-tools packages + +------------------------------------------------------------------- +Sun Nov 20 17:00:43 UTC 2011 - joop.boonen(a)opensuse.org + +- Cleaned the spec file up the spec file +- The name is the same as the package name + +------------------------------------------------------------------- +Sun Nov 13 13:13:39 UTC 2011 - joop.boonen(a)opensuse.org + +- Build u-boot according to http://elinux.org/Panda_How_to_MLO_&_u-boot +- Using .txt config file instead of .scr it's gerated via mkimage + +------------------------------------------------------------------- +Wed Nov 09 22:55:09 UTC 2011 - joop.boonen(a)opensuse.org + +- Used scr file based on http://elinux.org definition +- Build u-boot 20111109 +- Used the Meego panda u-boot as a base + +------------------------------------------------------------------- +Fri Feb 18 00:00:00 UTC 2011 - raghuveer.murthy(a)ti.com> +- 2010.09-MeeGo +- Fix for u-boot fails to compile on armv7hl, BMC#13140 + +------------------------------------------------------------------- +Thu Nov 18 00:00:00 UTC 2010 - peter.j.zhu(a)intel.com> +- 2010.09-MeeGo +- Don't build against i586, BMC#10159 + +------------------------------------------------------------------- +Tue Oct 10 00:00:00 UTC 2010 - nm(a)ti.com> +- 2010.09-MeeGo +- Add Das u-boot package - FEA#9723 + +------------------------------------------------------------------- +Tue Oct 10 00:00:00 UTC 2010 - nm(a)ti.com> +- 2010.09.rc1-MeeGo +- Added option to enable boot.scr generation and copy + +------------------------------------------------------------------- +Mon Oct 04 00:00:00 UTC 2010 - nm(a)ti.com> +- 2010.09.rc1-MeeGo +- Update to 2010.09 + +------------------------------------------------------------------- +Wed Sep 14 00:00:00 UTC 2010 - nm(a)ti.com> +- 2010.09.rc1-MeeGo +- Update to 2010.09.rc1 +- MeeGo customization +- Enabled PandaBoard, Beagleboard build + +------------------------------------------------------------------- +Wed Mar 31 00:00:00 UTC 2010 - silvan.calarco(a)mambasoft.it> +- 2009.11.1-1mamba +- update to 2009.11.1 + +------------------------------------------------------------------- New Changes file: u-boot-omap4panda.changes: same change New Changes file: u-boot-origen.changes: same change New Changes file: u-boot-u8500href.changes: same change New Changes file: u-boot.changes: same change Old: ---- _link New: ---- 0006-ARMV7-hardfp-build-fix.patch loadaddr-defaults.patch mlo-ext2.patch openSUSE_panda.txt pre_checkin.sh rpmlintrc u-boot-2012.04.tar.bz2 u-boot-omap3beagle.changes u-boot-omap3beagle.spec u-boot-omap4panda.changes u-boot-omap4panda.spec u-boot-origen.changes u-boot-origen.spec u-boot-u8500href.changes u-boot-u8500href.spec u-boot.changes u-boot.spec u-boot.spec.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-omap3beagle.spec ++++++ # # spec file for package u-boot-omap3beagle # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 1 Name: u-boot-omap3beagle Version: 2012.04 Release: 0 Summary: The u-boot firmware for the omap3beagle arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-omap3beagle Provides: x-loader-omap3beagle %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the omap3beagle arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # Any custom patches to be applied on top of mainline u-boot %patch1 -p1 %patch2 -p1 %patch3 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.bin %if %x_loader == 1 /boot/MLO %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-omap4panda.spec ++++++ # # spec file for package u-boot-omap4panda # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 1 Name: u-boot-omap4panda Version: 2012.04 Release: 0 Summary: The u-boot firmware for the omap4panda arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-omap4panda Provides: x-loader-omap4panda %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the omap4panda arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # Any custom patches to be applied on top of mainline u-boot %patch1 -p1 %patch2 -p1 %patch3 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.bin %if %x_loader == 1 /boot/MLO %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-origen.spec ++++++ # # spec file for package u-boot-origen # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 Name: u-boot-origen Version: 2012.04 Release: 0 Summary: The u-boot firmware for the origen arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-origen Provides: x-loader-origen %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the origen arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # Any custom patches to be applied on top of mainline u-boot %patch1 -p1 %patch2 -p1 %patch3 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" origen_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.bin %if %x_loader == 1 /boot/MLO %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot-u8500href.spec ++++++ # # spec file for package u-boot-u8500href # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 Name: u-boot-u8500href Version: 2012.04 Release: 0 Summary: The u-boot firmware for the u8500href arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-u8500href Provides: x-loader-u8500href %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the u8500href arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # Any custom patches to be applied on top of mainline u-boot %patch1 -p1 %patch2 -p1 %patch3 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" u8500_href_config # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.bin %if %x_loader == 1 /boot/MLO %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog ++++++ u-boot.spec ++++++ # # spec file for package u-boot # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: u-boot Version: 1 Release: 0 Summary: fake package License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot BuildRoot: %{_tmppath}/%{name}-%{version}-build %description dummy package %prep %build %install %clean %files %changelog ++++++ 0006-ARMV7-hardfp-build-fix.patch ++++++ Index: u-boot-2010.09/arch/arm/cpu/armv7/config.mk =================================================================== --- u-boot-2010.09.orig/arch/arm/cpu/armv7/config.mk 2011-02-17 18:43:19.828905882 +0530 +++ u-boot-2010.09/arch/arm/cpu/armv7/config.mk 2011-02-17 18:43:33.356906110 +0530 @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float +PLATFORM_RELFLAGS += -fno-common -ffixed-r8 # Make ARMv5 to allow more compilers to work, even though its v7a. PLATFORM_CPPFLAGS += -march=armv5 ++++++ loadaddr-defaults.patch ++++++ >From a8fab5078beb88a3f1ae46450d08d0db1460fccc Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Thu, 12 Jul 2012 09:55:58 +0200 Subject: [PATCH] OMAP: Provide reasonable kernel and initrd load addresses To make our generic boot.scr approach work, we need to make sure we have variables that tell us where to load the kernel and initrd to. Add them back into upstream u-boot again. They used to be there in the linaro version. Signed-off-by: Alexander Graf <agraf(a)suse.de> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 0c46d5b..c4df587 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -218,6 +218,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "rdaddr=0x81000000\0" \ + "kerneladdr=0x80200000\0" \ + "ramdiskaddr=0x81000000\0" \ "usbtty=cdc_acm\0" \ "bootfile=uImage.beagle\0" \ "console=ttyO2,115200n8\0" \ diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 00578fe..bc802f4 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -150,6 +150,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ + "kerneladdr=0x80000000\0" \ + "ramdiskaddr=0x82000000\0" \ "console=ttyO2,115200n8\0" \ "usbtty=cdc_acm\0" \ "vram=16M\0" \ ++++++ mlo-ext2.patch ++++++ diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c index 6f5b43e..f369e47 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c +++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c @@ -83,6 +83,53 @@ end: } } +static void mmc_load_image_ext2(struct mmc *mmc) +{ + s32 err; + struct image_header *header; + char *payloadname; + int filelen; + + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - + sizeof(struct image_header)); + + err = ext2fs_set_blk_dev(&mmc->block_dev, + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION); + if (!err) { + printf("spl: ext2fs register err - %d\n", err); + hang(); + } + + err = ext2fs_mount(0); + if (!err) { + printf("spl: ext2fs mount err - %d\n", err); + hang(); + } + + + payloadname = "u-boot.bin"; + + filelen = err = ext2fs_open(payloadname); + if (err < 0) { + goto end; + } + err = ext2fs_read((u8 *)header, sizeof(struct image_header)); + if (err <= 0) { + goto end; + } + + spl_parse_image_header(header); + + err = ext2fs_read((u8 *)spl_image.load_addr, filelen); + +end: + if (err <= 0) { + printf("spl: error reading image %s, err - %d\n", + payloadname, err); + hang(); + } +} + static void mmc_load_image_fat(struct mmc *mmc) { s32 err; @@ -136,12 +183,14 @@ void spl_mmc_load_image(void) hang(); } boot_mode = omap_boot_mode(); + boot_mode = MMCSD_MODE_FAT; if (boot_mode == MMCSD_MODE_RAW) { debug("boot mode - RAW\n"); mmc_load_image_raw(mmc); } else if (boot_mode == MMCSD_MODE_FAT) { debug("boot mode - FAT\n"); - mmc_load_image_fat(mmc); +// mmc_load_image_fat(mmc); + mmc_load_image_ext2(mmc); } else { puts("spl: wrong MMC boot mode\n"); hang(); diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index f621741..f38697c 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -25,9 +25,47 @@ #include <common.h> #include <ext2fs.h> -#include <malloc.h> #include <asm/byteorder.h> +#ifndef CONFIG_SPL_BUILD + +#include <malloc.h> + +#else + +/* compat stuff */ + +void *free_buf; +void *topmost_entry; +int topmost_size; +char heap[10240]; + +static inline void *malloc(int size) +{ + void *r; + if (!free_buf) + free_buf = heap; + memset(free_buf, 0, size); + r = free_buf; + free_buf += size; + topmost_entry = r; + topmost_size = size; + return r; +} + +static inline void free(void *p) +{ + if (p == topmost_entry) { + free_buf -= topmost_size; + topmost_entry = 0; + } else { + printf("leaked %d bytes\n", topmost_size); + } +} + +#endif + + extern int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf); diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ddeb414..0c46d5b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -256,7 +256,7 @@ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ "bootenv=uEnv.txt\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "loadbootenv=ext2load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t $loadaddr $filesize\0" \ "ramargs=setenv bootargs console=${console} " \ @@ -268,8 +268,8 @@ "omapdss.def_disp=${defaultdisplay} " \ "root=${ramroot} " \ "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ + "loadramdisk=ext2load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "loaduimagefat=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \ "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index a989721..00578fe 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -160,10 +160,10 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ - "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ + "loaduimage=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ diff --git a/spl/Makefile b/spl/Makefile index ea7d475..6abfd7e 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -51,6 +51,7 @@ LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/libserial.o LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/libspi_flash.o LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/libspi.o LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/libfat.o +LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/ext2/libext2fs.o LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/libgeneric.o LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/libpower.o LIBS-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/libnand.o ++++++ openSUSE_panda.txt ++++++ setenv bootargs 'root=/dev/mmcblk0p2 rw rootwait rootfstype=ext3 console=ttyO2,115200n8 vram=16M' fatload mmc 0 82000000 uImage bootm 82000000 ++++++ pre_checkin.sh ++++++ #!/bin/bash -e BOARDNAME="$1" BOARDCONFIG="$2" if [ ! "$1" -o ! "$2" ]; then for BOARDCONFIG in omap3_beagle omap4_panda u8500_href origen; do BOARDNAME="$(echo $BOARDCONFIG | tr -d '_')" BOARDCONFIG=${BOARDCONFIG}_config bash $0 $BOARDNAME $BOARDCONFIG done exit 0 fi if [ "$(echo $BOARDCONFIG | grep omap)" ]; then XLOADER=1 else XLOADER=0 fi sed "s/BOARDCONFIG/$BOARDCONFIG/g s/BOARDNAME/$BOARDNAME/g s/XLOADER/$XLOADER/g" < u-boot.spec.in > u-boot-$BOARDNAME.spec cp u-boot.changes u-boot-$BOARDNAME.changes ++++++ rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter("no-binary") addFilter("name-repeated-in-summary") addFilter("incorrect-fsf-address") addFilter("file-contains-date-and-time") addFilter("strict-aliasing-punning") addFilter("no-rpm-opt-flags") ++++++ u-boot.spec.in ++++++ # # spec file for package u-boot-BOARDNAME # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader XLOADER Name: u-boot-BOARDNAME Version: 2012.04 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: u-boot-%{version}.tar.bz2 Source1: openSUSE_panda.txt Source300: rpmlintrc Patch1: 0006-ARMV7-hardfp-build-fix.patch Patch2: mlo-ext2.patch Patch3: loadaddr-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-BOARDNAME Provides: x-loader-BOARDNAME %endif ExclusiveArch: %arm %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the BOARDNAME arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{version} # Any custom patches to be applied on top of mainline u-boot %patch1 -p1 %patch2 -p1 %patch3 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG # temporary disable of --build-id #make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes %install install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /boot/u-boot.bin %if %x_loader == 1 /boot/MLO %endif %doc COPYING CREDITS README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-SoC doc/README.ARM-memory-map %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit transfig for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package transfig for openSUSE:Factory checked in at 2012-07-24 16:11:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/transfig (Old) and /work/SRC/openSUSE:Factory/.transfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "transfig", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/transfig/transfig.changes 2012-07-12 10:53:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.transfig.new/transfig.changes 2012-07-24 17:22:39.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 24 09:46:42 UTC 2012 - werner(a)suse.de + +- Add missed fonts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transfig.spec ++++++ --- /var/tmp/diff_new_pack.Px5X5i/_old 2012-07-24 17:22:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Px5X5i/_new 2012-07-24 17:22:43.000000000 +0200 @@ -21,8 +21,11 @@ BuildRequires: netpbm BuildRequires: texlive-latex %if %suse_version > 1220 +BuildRequires: texlive-amsfonts +BuildRequires: texlive-cm-super BuildRequires: texlive-courier BuildRequires: texlive-dvips +BuildRequires: texlive-pdftex BuildRequires: texlive-times BuildRequires: tex(times.sty) %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rhythmbox for openSUSE:12.2
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package rhythmbox for openSUSE:12.2 checked in at 2012-07-24 16:11:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/rhythmbox (Old) and /work/SRC/openSUSE:12.2/.rhythmbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rhythmbox", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/rhythmbox/rhythmbox.changes 2012-06-26 17:29:22.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.rhythmbox.new/rhythmbox.changes 2012-07-24 17:22:38.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 24 11:15:36 UTC 2012 - vuntz(a)opensuse.org + +- Add rhythmbox-CVE-2012-3355.patch: fix insecure temporary + directory use in context plugin. Fix bnc#768681, CVE-2012-3355. + +------------------------------------------------------------------- New: ---- rhythmbox-CVE-2012-3355.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhythmbox.spec ++++++ --- /var/tmp/diff_new_pack.9vOcdj/_old 2012-07-24 17:22:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9vOcdj/_new 2012-07-24 17:22:38.000000000 +0200 @@ -24,6 +24,8 @@ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org/projects/rhythmbox/ Source: http://download.gnome.org/sources/rhythmbox/2.97/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM rhythmbox-CVE-2012-3355.patch CVE-2012-3355 bnc#768681 vuntz(a)opensuse.org -- Fix insecure temporary directory use in context plugin +Patch0: rhythmbox-CVE-2012-3355.patch BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -97,6 +99,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build export MOZILLA_PLUGINDIR=%{_libdir}/browser-plugins ++++++ rhythmbox-CVE-2012-3355.patch ++++++ >From 01a829f549a0fd90ad8c8befd0793fa5f133f8f8 Mon Sep 17 00:00:00 2001 From: Jonathan Matthew <jonathan(a)d14n.org> Date: Tue, 24 Jul 2012 10:43:36 +0000 Subject: context: remove the module_context parameter (bug #678661) Caching the template modules doesn't really buy us anything, and there is the possibility that it could be used to load hostile code into another user's process (since the module directory was under /tmp). If it turns out we need the cache, we should put it somewhere under the XDG cache dir. --- diff --git a/plugins/context/AlbumTab.py b/plugins/context/AlbumTab.py index 5d32171..61b3a1a 100644 --- a/plugins/context/AlbumTab.py +++ b/plugins/context/AlbumTab.py @@ -125,10 +125,8 @@ class AlbumView (GObject.GObject): def load_tmpl (self): self.path = rb.find_plugin_file (self.plugin, 'tmpl/album-tmpl.html') self.loading_path = rb.find_plugin_file (self.plugin, 'tmpl/loading.html') - self.album_template = Template (filename = self.path, - module_directory = '/tmp/context') - self.loading_template = Template (filename = self.loading_path, - module_directory = '/tmp/context') + self.album_template = Template (filename = self.path) + self.loading_template = Template (filename = self.loading_path) self.styles = self.basepath + '/tmpl/main.css' def album_list_ready (self, ds): diff --git a/plugins/context/ArtistTab.py b/plugins/context/ArtistTab.py index daa6027..4859991 100644 --- a/plugins/context/ArtistTab.py +++ b/plugins/context/ArtistTab.py @@ -123,8 +123,8 @@ class ArtistView (GObject.GObject): def load_tmpl (self): self.path = rb.find_plugin_file(self.plugin, 'tmpl/artist-tmpl.html') self.loading_path = rb.find_plugin_file (self.plugin, 'tmpl/loading.html') - self.template = Template (filename = self.path, module_directory = '/tmp/context/') - self.loading_template = Template (filename = self.loading_path, module_directory = '/tmp/context') + self.template = Template (filename = self.path) + self.loading_template = Template (filename = self.loading_path) self.styles = self.basepath + '/tmpl/main.css' def connect_signals (self): diff --git a/plugins/context/LinksTab.py b/plugins/context/LinksTab.py index 326024a..519e46c 100644 --- a/plugins/context/LinksTab.py +++ b/plugins/context/LinksTab.py @@ -106,8 +106,7 @@ class LinksView (GObject.GObject): self.path = rb.find_plugin_file(self.plugin, 'tmpl/links-tmpl.html') self.images = self.basepath + '/img/links/' self.styles = self.basepath + '/tmpl/main.css' - self.template = Template (filename = self.path, - module_directory = '/tmp/context/') + self.template = Template (filename = self.path) self.file = self.template.render (error = ds.get_error (), artist = ds.get_artist(), diff --git a/plugins/context/LyricsTab.py b/plugins/context/LyricsTab.py index 96b44c4..c8b1fed 100644 --- a/plugins/context/LyricsTab.py +++ b/plugins/context/LyricsTab.py @@ -110,10 +110,8 @@ class LyricsView (GObject.GObject): def load_tmpl (self): self.path = rb.find_plugin_file(self.plugin, 'tmpl/lyrics-tmpl.html') self.loading_path = rb.find_plugin_file (self.plugin, 'tmpl/loading.html') - self.template = Template (filename = self.path, - module_directory = '/tmp/context/') - self.loading_template = Template (filename = self.loading_path, - module_directory = '/tmp/context') + self.template = Template (filename = self.path) + self.loading_template = Template (filename = self.loading_path) self.styles = self.basepath + '/tmpl/main.css' def lyrics_ready (self, ds, entry, lyrics): -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rhythmbox for openSUSE:Factory
by root＠hilbert.suse.de 24 Jul '12

24 Jul '12

Hello community, here is the log from the commit of package rhythmbox for openSUSE:Factory checked in at 2012-07-24 16:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rhythmbox (Old) and /work/SRC/openSUSE:Factory/.rhythmbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rhythmbox", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/rhythmbox/rhythmbox.changes 2012-06-26 17:29:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rhythmbox.new/rhythmbox.changes 2012-07-24 17:22:31.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 24 11:15:36 UTC 2012 - vuntz(a)opensuse.org + +- Add rhythmbox-CVE-2012-3355.patch: fix insecure temporary + directory use in context plugin. Fix bnc#768681, CVE-2012-3355. + +------------------------------------------------------------------- New: ---- rhythmbox-CVE-2012-3355.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhythmbox.spec ++++++ --- /var/tmp/diff_new_pack.xIBa2h/_old 2012-07-24 17:22:38.000000000 +0200 +++ /var/tmp/diff_new_pack.xIBa2h/_new 2012-07-24 17:22:38.000000000 +0200 @@ -24,6 +24,8 @@ Group: Productivity/Multimedia/Sound/Players Url: http://www.gnome.org/projects/rhythmbox/ Source: http://download.gnome.org/sources/rhythmbox/2.97/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM rhythmbox-CVE-2012-3355.patch CVE-2012-3355 bnc#768681 vuntz(a)opensuse.org -- Fix insecure temporary directory use in context plugin +Patch0: rhythmbox-CVE-2012-3355.patch BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -97,6 +99,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build export MOZILLA_PLUGINDIR=%{_libdir}/browser-plugins ++++++ rhythmbox-CVE-2012-3355.patch ++++++ >From 01a829f549a0fd90ad8c8befd0793fa5f133f8f8 Mon Sep 17 00:00:00 2001 From: Jonathan Matthew <jonathan(a)d14n.org> Date: Tue, 24 Jul 2012 10:43:36 +0000 Subject: context: remove the module_context parameter (bug #678661) Caching the template modules doesn't really buy us anything, and there is the possibility that it could be used to load hostile code into another user's process (since the module directory was under /tmp). If it turns out we need the cache, we should put it somewhere under the XDG cache dir. --- diff --git a/plugins/context/AlbumTab.py b/plugins/context/AlbumTab.py index 5d32171..61b3a1a 100644 --- a/plugins/context/AlbumTab.py +++ b/plugins/context/AlbumTab.py @@ -125,10 +125,8 @@ class AlbumView (GObject.GObject): def load_tmpl (self): self.path = rb.find_plugin_file (self.plugin, 'tmpl/album-tmpl.html') self.loading_path = rb.find_plugin_file (self.plugin, 'tmpl/loading.html') - self.album_template = Template (filename = self.path, - module_directory = '/tmp/context') - self.loading_template = Template (filename = self.loading_path, - module_directory = '/tmp/context') + self.album_template = Template (filename = self.path) + self.loading_template = Template (filename = self.loading_path) self.styles = self.basepath + '/tmpl/main.css' def album_list_ready (self, ds): diff --git a/plugins/context/ArtistTab.py b/plugins/context/ArtistTab.py index daa6027..4859991 100644 --- a/plugins/context/ArtistTab.py +++ b/plugins/context/ArtistTab.py @@ -123,8 +123,8 @@ class ArtistView (GObject.GObject): def load_tmpl (self): self.path = rb.find_plugin_file(self.plugin, 'tmpl/artist-tmpl.html') self.loading_path = rb.find_plugin_file (self.plugin, 'tmpl/loading.html') - self.template = Template (filename = self.path, module_directory = '/tmp/context/') - self.loading_template = Template (filename = self.loading_path, module_directory = '/tmp/context') + self.template = Template (filename = self.path) + self.loading_template = Template (filename = self.loading_path) self.styles = self.basepath + '/tmpl/main.css' def connect_signals (self): diff --git a/plugins/context/LinksTab.py b/plugins/context/LinksTab.py index 326024a..519e46c 100644 --- a/plugins/context/LinksTab.py +++ b/plugins/context/LinksTab.py @@ -106,8 +106,7 @@ class LinksView (GObject.GObject): self.path = rb.find_plugin_file(self.plugin, 'tmpl/links-tmpl.html') self.images = self.basepath + '/img/links/' self.styles = self.basepath + '/tmpl/main.css' - self.template = Template (filename = self.path, - module_directory = '/tmp/context/') + self.template = Template (filename = self.path) self.file = self.template.render (error = ds.get_error (), artist = ds.get_artist(), diff --git a/plugins/context/LyricsTab.py b/plugins/context/LyricsTab.py index 96b44c4..c8b1fed 100644 --- a/plugins/context/LyricsTab.py +++ b/plugins/context/LyricsTab.py @@ -110,10 +110,8 @@ class LyricsView (GObject.GObject): def load_tmpl (self): self.path = rb.find_plugin_file(self.plugin, 'tmpl/lyrics-tmpl.html') self.loading_path = rb.find_plugin_file (self.plugin, 'tmpl/loading.html') - self.template = Template (filename = self.path, - module_directory = '/tmp/context/') - self.loading_template = Template (filename = self.loading_path, - module_directory = '/tmp/context') + self.template = Template (filename = self.path) + self.loading_template = Template (filename = self.loading_path) self.styles = self.basepath + '/tmpl/main.css' def lyrics_ready (self, ds, entry, lyrics): -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0