From fedora-cvs-commits at redhat.com Thu Sep 1 00:08:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Aug 2005 20:08:51 -0400 Subject: rpms/xorg-x11/FC-4 xorg-x11.spec,1.204,1.205 Message-ID: <200509010008.j8108p7a009701@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv9672 Modified Files: xorg-x11.spec Log Message: Add build_fc5 macro back, oops Index: xorg-x11.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- xorg-x11.spec 31 Aug 2005 23:47:10 -0000 1.204 +++ xorg-x11.spec 1 Sep 2005 00:08:48 -0000 1.205 @@ -37,12 +37,14 @@ %if ! %{build_autodetect_mode} # Set *one* of the following build targets to 1 as appropriate # Fedora Core development builds a.k.a. "rawhide" +%define build_fc5 0 %define build_fc4 1 %define build_rhel4 0 %define build_fc3 0 %define build_fc2 0 %define build_mharris 0 %else +%define build_fc5 0 %define build_fc4 0 %define build_rhel4 0 %define build_fc3 0 @@ -587,10 +589,12 @@ Summary: X Window System application development package Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} + # Experimental Requires libGL{,U}. Once confirmed safe, we can deconditionalize -%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 ) +%if %{build_fc5} || %{build_fc4} || %{build_fc3} Requires: libGL >= 1, libGLU >= 1 %endif + Obsoletes: xpm-devel, Mesa-devel Obsoletes: Xft-devel Provides: xpm-devel, Mesa-devel @@ -698,6 +702,7 @@ ###################################################################### %package xdm Summary: X Display Manager +Group: User Interface/X Requires: %{name} = %{version}, /etc/pam.d/system-auth # pam requires were added for bug #159332 for new audit system. It really # should be a virtual provide in the pam package, to avoid odd version-release @@ -708,10 +713,8 @@ %if %{build_fc5} Requires: pam >= 0.77-10 %endif - # xinitrc requirement on 3.13 for user login shell enhancement to Xsession Requires: xinitrc >= 3.13 -Group: User Interface/X Obsoletes: XFree86-xdm Provides: xdm @@ -989,7 +992,7 @@ # FIXME: These should be versioned to the Mesa version Obsoletes: Mesa Provides: Mesa -%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 ) +%if %{build_fc5} || %{build_fc4} || %{build_fc3} Provides: libGL = 1 %endif Obsoletes: XFree86-Mesa-libGL @@ -1011,7 +1014,7 @@ Summary: Commonly used GL utility library Group: System Environment/Libraries Obsoletes: XFree86-Mesa-libGLU -%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 ) +%if %{build_fc5} || %{build_fc4} || %{build_fc3} Provides: libGLU = 1 %endif # Conflict is due to this package being split out from XFree86-libs a long time ago @@ -1161,7 +1164,7 @@ # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently) # Update: Also enabled for FC3-testing build to be released soon, which will # ultimately end up in an official FC3 update eventually as well. -%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 ) +%if %{build_fc5} || %{build_fc4} || %{build_fc3} %patch9500 -p0 -b .deassert-ddc-lines %patch9501 -p0 -b .laptop-modes.patch From fedora-cvs-commits at redhat.com Thu Sep 1 00:11:58 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Aug 2005 20:11:58 -0400 Subject: rpms/xorg-x11/FC-4 xorg-x11.spec,1.205,1.206 Message-ID: <200509010011.j810BwS5011255@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11226 Modified Files: xorg-x11.spec Log Message: Remove remants of libvgahw workaround Index: xorg-x11.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- xorg-x11.spec 1 Sep 2005 00:08:48 -0000 1.205 +++ xorg-x11.spec 1 Sep 2005 00:11:55 -0000 1.206 @@ -528,7 +528,6 @@ Patch9720: xorg-x11-6.8.2-gcc4-fix.patch Patch9721: xorg-x11-6.8.2-xnest-update-modifier-state-fdo3030-fdo3664.patch Patch9722: xorg-x11-6.8.2-xnest-fix-warning-spew-fdo3513.patch -Patch9723: xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch # END OF 6.8.3 CANDIDATES @@ -1196,10 +1195,6 @@ %patch9721 -p0 -b .xnest-update-modifier-state-fdo3030-fdo3664 %patch9722 -p0 -b .xnest-fix-warning-spew-fdo3513 -# gcc-4.0.1-4 has a workaround for the volatile over-optimization so -# disable this patch for now. -# %patch9723 -p0 -b .libvgahw-workaround-rh161242 - %endif ######################################################################## From fedora-cvs-commits at redhat.com Thu Sep 1 01:29:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Aug 2005 21:29:02 -0400 Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.61, 1.62 Message-ID: <200509010129.j811T2FY025094@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24939 Modified Files: evolution-data-server.spec Log Message: * Wed Aug 31 2005 David Malcolm - 1.3.8-6 - Use regular LDAP library for now, rather than evolution-openldap (#167238) Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- evolution-data-server.spec 30 Aug 2005 21:47:38 -0000 1.61 +++ evolution-data-server.spec 1 Sep 2005 01:28:57 -0000 1.62 @@ -5,7 +5,7 @@ %define use_mozilla_nss 1 %define ldap_support 1 -%define static_ldap 1 +%define static_ldap 0 %define krb5_support 1 %define nntp_support 1 @@ -25,7 +25,7 @@ Summary: Backend data server for evolution Name: evolution-data-server Version: 1.3.8 -Release: 5 +Release: 6 License: GPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -228,6 +228,9 @@ %changelog +* Wed Aug 31 2005 David Malcolm - 1.3.8-6 +- Use regular LDAP library for now, rather than evolution-openldap (#167238) + * Tue Aug 30 2005 David Malcolm - 1.3.8-5 - Add -Werror-implicit-function-declaration back to CFLAGS at the make stage, after the configure, to spot 64-bit problems whilst avoiding breaking From fedora-cvs-commits at redhat.com Thu Sep 1 08:18:50 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 04:18:50 -0400 Subject: rpms/evince/FC-4 evince-0.4.0-dbus-fix.patch, NONE, 1.1 evince.spec, 1.24, 1.25 Message-ID: <200509010818.j818IoZH012163@cvs.devel.redhat.com> Author: mpg Update of /cvs/dist/rpms/evince/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv12107 Modified Files: evince.spec Added Files: evince-0.4.0-dbus-fix.patch Log Message: * Thu Sep 1 2005 Marco Pesenti Gritti - 0.4.0-1.2 - Add evince-0.4.0-dbus-fix.patch evince-0.4.0-dbus-fix.patch: main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE evince-0.4.0-dbus-fix.patch --- --- evince-0.4.0/shell/main.c.dbus-fix 2005-09-01 04:14:54.000000000 -0400 +++ evince-0.4.0/shell/main.c 2005-09-01 04:15:33.000000000 -0400 @@ -152,7 +152,7 @@ if (!files) { #if DBUS_VERSION <= 33 call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", - DBUS_TYPE_UINT32, timestamp, + DBUS_TYPE_UINT32, ×tamp, DBUS_TYPE_INVALID); if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { @@ -193,7 +193,7 @@ call = dbus_g_proxy_begin_call (remote_object, "OpenURI", DBUS_TYPE_STRING, &uri, DBUS_TYPE_STRING, &page_label, - DBUS_TYPE_UINT32, timestamp, + DBUS_TYPE_UINT32, ×tamp, DBUS_TYPE_INVALID); if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { Index: evince.spec =================================================================== RCS file: /cvs/dist/rpms/evince/FC-4/evince.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- evince.spec 31 Aug 2005 10:02:05 -0000 1.24 +++ evince.spec 1 Sep 2005 08:18:48 -0000 1.25 @@ -4,7 +4,7 @@ Summary: Document viewer Name: evince Version: 0.4.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Applications/Publishing Source0: %{name}-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Requires: poppler >= %{poppler_version} Patch0: evince-0.4.0-old-doc-utils +Patch1: evince-0.4.0-dbus-fix.patch %description evince is a GNOME-based document viewer. @@ -36,6 +37,7 @@ %{__tar} -xzf %{SOURCE1} %patch0 -p1 -b .old-doc-utils +%patch1 -p1 -b .dbus-fix %build %configure @@ -84,6 +86,9 @@ %{_datadir}/omf/evince %changelog +* Thu Sep 1 2005 Marco Pesenti Gritti - 0.4.0-1.2 +- Add evince-0.4.0-dbus-fix.patch + * Fri Aug 26 2005 Marco Pesenti Gritti - 0.4.0-1.1 - Update to 0.4.0 and merge some fixes from devel - Update poppler version req From fedora-cvs-commits at redhat.com Thu Sep 1 08:44:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 04:44:29 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch, NONE, 1.1 .cvsignore, 1.74, 1.75 openoffice.org.spec, 1.433, 1.434 sources, 1.109, 1.110 workspace.cmcfixes15.patch, 1.3, NONE workspace.cmcfixes16.patch, 1.3, NONE Message-ID: <200509010844.j818iTxa022570@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22539 Modified Files: .cvsignore openoffice.org.spec sources Added Files: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch Removed Files: workspace.cmcfixes15.patch workspace.cmcfixes16.patch Log Message: next version openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch: source/filter.vcl/filter/FilterConfigCache.cxx | 0 svtools/source/filter.vcl/filter/FilterConfigCache.cxx | 3 +++ 2 files changed, 3 insertions(+) --- NEW FILE openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch --- Index: source/filter.vcl/filter/FilterConfigCache.cxx =================================================================== RCS file: /cvs/util/svtools/source/filter.vcl/filter/FilterConfigCache.cxx,v retrieving revision 1.18 diff -u -p -u -r1.18 FilterConfigCache.cxx --- openoffice.org.orig/svtools/source/filter.vcl/filter/FilterConfigCache.cxx 28 Jun 2004 16:10:50 -0000 1.18 +++ openoffice.org/svtools/source/filter.vcl/filter/FilterConfigCache.cxx 31 Aug 2005 14:52:38 -0000 @@ -367,6 +367,9 @@ void FilterConfigCache::ImplInit() Reference< XNameAccess > xTypeAccess ( openConfig("types" ), UNO_QUERY ); Reference< XNameAccess > xFilterAccess( openConfig("filters"), UNO_QUERY ); + if (!xFilterAccess.is()) + return; + Sequence< OUString > lAllFilter = xFilterAccess->getElementNames(); sal_Int32 nAllFilterCount = lAllFilter.getLength(); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- .cvsignore 27 Aug 2005 19:47:31 -0000 1.74 +++ .cvsignore 1 Sep 2005 08:44:25 -0000 1.75 @@ -133,3 +133,4 @@ SRC680_m125.tar.bz2 opens___.ttf SRC680_m126.tar.bz2 +SRC680_m127.tar.bz2 Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.433 retrieving revision 1.434 diff -u -r1.433 -r1.434 --- openoffice.org.spec 31 Aug 2005 14:12:52 -0000 1.433 +++ openoffice.org.spec 1 Sep 2005 08:44:26 -0000 1.434 @@ -1,5 +1,5 @@ -%define ooo2ver 126 -%define ooo_rpm_release 1.cmc +%define ooo2ver 127 +%define ooo_rpm_release 1 %define build_fc4 0 %define build_fc5 1 @@ -168,13 +168,12 @@ Patch48: openoffice.org-1.9.112.ooo53025.exception.package.patch Patch49: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch Patch50: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch -Patch51: workspace.cmcfixes15.patch -Patch52: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch -Patch53: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch -Patch54: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch -Patch55: workspace.cmcfixes16.patch -Patch56: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch -Patch57: workspace.impress57.patch +Patch51: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch +Patch52: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch +Patch53: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch +Patch54: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch +Patch55: workspace.impress57.patch +Patch56: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -825,13 +824,12 @@ %patch48 -p1 -b .ooo53025.exception.package.patch %patch49 -p1 -b .ooo53397.prelinkoptimize.desktop.patch %patch50 -p1 -b .ooo53612.systemnp_sdk.extensions.patch -%patch51 -p1 -b .workspace.cmcfixes15.patch -%patch52 -p1 -b .ooo53682.nfslock.sal.patch -%patch53 -p1 -b .ooo53699.uzipunused.postprocess.patch -%patch54 -p1 -b .ooo53723.bulletexport.vcl.patch -%patch55 -p1 -b .workspace.cmcfixes16.patch -%patch56 -p1 -b .oooXXXXX.uselibxslt.xmlhelp.patch -%patch57 -p1 -b .workspace.impress57.patch +%patch51 -p1 -b .ooo53682.nfslock.sal.patch +%patch52 -p1 -b .ooo53699.uzipunused.postprocess.patch +%patch53 -p1 -b .ooo53723.bulletexport.vcl.patch +%patch54 -p1 -b .oooXXXXX.uselibxslt.xmlhelp.patch +%patch55 -p1 -b .workspace.impress57.patch +%patch56 -p1 -b .ooo54040.savecrash.svtools.patch %if %{includeexternals} #start ludicrous workaround @@ -3123,11 +3121,15 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Tue Aug 30 2005 Caolan McNamara - 1:1.9.126-2 +* Wed Aug 31 2005 Caolan McNamara - 1:1.9.127-1 +- bump to next version - ooo#53956# thai dictionary - remove unslightly warning from gnomeprint - replace sablot with libxslt i.e. help application - add workspace.impress57.patch for rh#167130# +- add plausible .ooo54040.savecrash.svtools.patch fix for rh#167178# +- drop integrated workspace.cmcfixes15.patch +- drop integrated workspace.cmcfixes16.patch * Sat Aug 27 2005 Caolan McNamara - 1:1.9.126-1 - next version Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- sources 30 Aug 2005 16:14:38 -0000 1.109 +++ sources 1 Sep 2005 08:44:26 -0000 1.110 @@ -5,4 +5,4 @@ a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu 73aac8274b29c79ac2041d0963faa2b8 openoffice.org-myspell-contrib.tar.gz 66ee360bd11d33b0ba2283922d853706 opens___.ttf -c64966caa9742c05ffbf876bde97362e SRC680_m126.tar.bz2 +2193774f15b3309c7caea27c26fee1f7 SRC680_m127.tar.bz2 --- workspace.cmcfixes15.patch DELETED --- --- workspace.cmcfixes16.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Sep 1 09:01:13 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 05:01:13 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.1, 1.2 Message-ID: <200509010901.j8191D6l022714@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22691 Modified Files: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch Log Message: post integration openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch: beanshell/makefile.mk | 6 ++ com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 0 config_office/configure.in | 44 ++++++++++++++++ config_office/set_soenv.in | 4 + connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 9 ++- hsqldb/makefile.mk | 6 ++ scp2/source/ooo/file_ooo.scp | 6 +- scp2/source/ooo/makefile.mk | 8 ++ scp2/source/ooo/profileitem_ooo.scp | 8 ++ scripting/java/build.xml | 2 solenv/config/ssrc680.ini | 4 - 11 files changed, 89 insertions(+), 8 deletions(-) Index: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 23 Aug 2005 19:02:52 -0000 1.1 +++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 1 Sep 2005 09:01:09 -0000 1.2 @@ -268,12 +268,12 @@ diff -ru solenv.ori/config/ssrc680.ini solenv/config/ssrc680.ini --- openoffice.org.orig/solenv/config/ssrc680.ini 2005-08-08 08:41:21.000000000 +0100 +++ openoffice.org/solenv/config/ssrc680.ini 2005-08-08 08:41:40.000000000 +0100 -@@ -113,7 +113,7 @@ +@@ -108,7 +108,7 @@ BIG_SVX TRUE BIG_GOODIES TRUE BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK +- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST ++ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST HSQLDB BSH RES_ENUS TRUE RES_GER TRUE NO_REC_RES TRUE From fedora-cvs-commits at redhat.com Thu Sep 1 09:12:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 05:12:15 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.2, 1.3 Message-ID: <200509010912.j819CFOC022851@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22837 Modified Files: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch Log Message: hang on, doesn't matter for configure build openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch: beanshell/makefile.mk | 6 ++ com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 0 config_office/configure.in | 44 ++++++++++++++++ config_office/set_soenv.in | 4 + connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 9 ++- hsqldb/makefile.mk | 6 ++ scp2/source/ooo/file_ooo.scp | 6 +- scp2/source/ooo/makefile.mk | 8 ++ scp2/source/ooo/profileitem_ooo.scp | 8 ++ scripting/java/build.xml | 2 solenv/config/ssrc680.ini | 2 11 files changed, 88 insertions(+), 7 deletions(-) Index: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 1 Sep 2005 09:01:09 -0000 1.2 +++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 1 Sep 2005 09:12:12 -0000 1.3 @@ -265,15 +265,3 @@ -diff -ru solenv.ori/config/ssrc680.ini solenv/config/ssrc680.ini ---- openoffice.org.orig/solenv/config/ssrc680.ini 2005-08-08 08:41:21.000000000 +0100 -+++ openoffice.org/solenv/config/ssrc680.ini 2005-08-08 08:41:40.000000000 +0100 -@@ -108,7 +108,7 @@ - BIG_SVX TRUE - BIG_GOODIES TRUE - BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST HSQLDB BSH - RES_ENUS TRUE - RES_GER TRUE - NO_REC_RES TRUE From fedora-cvs-commits at redhat.com Thu Sep 1 09:31:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 05:31:24 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.3, 1.4 Message-ID: <200509010931.j819VOcP007655@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7635 Modified Files: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch Log Message: duplication openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch: beanshell/makefile.mk | 6 ++ com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 0 config_office/configure.in | 44 ++++++++++++++++ config_office/set_soenv.in | 4 + connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 9 ++- hsqldb/makefile.mk | 6 ++ scp2/source/ooo/file_ooo.scp | 6 +- scp2/source/ooo/makefile.mk | 8 ++ scp2/source/ooo/profileitem_ooo.scp | 8 ++ scripting/java/build.xml | 2 10 files changed, 87 insertions(+), 6 deletions(-) Index: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 1 Sep 2005 09:12:12 -0000 1.3 +++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 1 Sep 2005 09:30:51 -0000 1.4 @@ -134,17 +134,6 @@ +#endif End ---- openoffice.org.orig/solenv/config/ssrc680.ini 2005-08-04 12:50:37.000000000 +0100 -+++ openoffice.org/solenv/config/ssrc680.ini 2005-08-04 12:51:28.000000000 +0100 -@@ -113,7 +113,7 @@ - BIG_SVX TRUE - BIG_GOODIES TRUE - BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK - RES_ENUS TRUE - RES_GER TRUE - NO_REC_RES TRUE diff -ru beanshell.orig/makefile.mk beanshell/makefile.mk --- openoffice.org.orig/beanshell/makefile.mk 2005-08-08 08:42:40.000000000 +0100 +++ openoffice.org/beanshell/makefile.mk 2005-08-08 08:43:19.000000000 +0100 From fedora-cvs-commits at redhat.com Thu Sep 1 09:58:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 05:58:43 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch, 1.2, 1.3 Message-ID: <200509010958.j819whVl026055@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26024 Modified Files: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch Log Message: X openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch: config_office/configure.in | 21 ++ config_office/set_soenv.in | 1 prj/build.lst | 0 source/cxxhelp/provider/makefile.mk | 0 source/cxxhelp/provider/urlparameter.cxx | 0 util/makefile.mk | 0 xmlhelp/prj/build.lst | 2 xmlhelp/source/cxxhelp/provider/makefile.mk | 6 xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 220 +++++++++++++++++++---- xmlhelp/util/makefile.mk | 13 + 10 files changed, 224 insertions(+), 39 deletions(-) Index: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch 31 Aug 2005 10:05:14 -0000 1.2 +++ openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch 1 Sep 2005 09:58:39 -0000 1.3 @@ -56,18 +56,6 @@ ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" ); ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" ); ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); -diff -ru solenv.orig/config/ssrc680.ini solenv/config/ssrc680.ini ---- openoffice.org.orig/solenv/config/ssrc680.ini 2005-08-30 15:56:42.000000000 +0100 -+++ openoffice.org/solenv/config/ssrc680.ini 2005-08-30 15:57:12.000000000 +0100 -@@ -108,7 +108,7 @@ - BIG_SVX TRUE - BIG_GOODIES TRUE - BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD SABLOT - RES_ENUS TRUE - RES_GER TRUE - NO_REC_RES TRUE Index: prj/build.lst =================================================================== RCS file: /cvs/util/xmlhelp/prj/build.lst,v From fedora-cvs-commits at redhat.com Thu Sep 1 10:10:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 06:10:23 -0400 Subject: rpms/xorg-x11/devel XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch, 1.1, 1.2 Message-ID: <200509011010.j81AAMft029267@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29238 Modified Files: XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch Log Message: Split very long string into two xf86Msg() calls, as the string has to fit into buffer 1024 chars in length in ErrorF() XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch: riva_hw.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletion(-) Index: XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/devel/XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch 9 Sep 2004 14:54:30 -0000 1.1 +++ XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch 1 Sep 2005 10:10:19 -0000 1.2 @@ -95,8 +95,8 @@ +"\tdriver releases, this driver has had the above debugging\n" +"\tinformation added in the autodetection logic by Red Hat. If\n" +"\tyou are seeing this message, please file a bug report in the\n" -+"\tRed Hat bugzilla at http://bugzilla.redhat.com indicating that\n" -+"\tyour Nvidia video adaptor has misdetected video memory. Make\n" ++"\tRed Hat bugzilla at http://bugzilla.redhat.com indicating that\n"); ++ xf86Msg(X_INFO,"\tyour Nvidia video adaptor has misdetected video memory. Make\n" +"\tsure you attach the X config file \"/etc/X11/XF86Config\",\n" +"\tX server log file \"/var/log/XFree86.0.log\", and the output\n" +"\tof the command \"lspci -vvn\" to the bug report as individual\n" From fedora-cvs-commits at redhat.com Thu Sep 1 10:12:12 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 06:12:12 -0400 Subject: rpms/xorg-x11/FC-4 XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch, 1.1, 1.2 Message-ID: <200509011012.j81ACCdu030187@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv30155 Modified Files: XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch Log Message: Split very long string into two xf86Msg() calls, as the string has to fit into buffer 1024 chars in length in ErrorF() XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch: riva_hw.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletion(-) Index: XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/FC-4/XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch 9 Sep 2004 14:54:30 -0000 1.1 +++ XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch 1 Sep 2005 10:12:08 -0000 1.2 @@ -95,8 +95,8 @@ +"\tdriver releases, this driver has had the above debugging\n" +"\tinformation added in the autodetection logic by Red Hat. If\n" +"\tyou are seeing this message, please file a bug report in the\n" -+"\tRed Hat bugzilla at http://bugzilla.redhat.com indicating that\n" -+"\tyour Nvidia video adaptor has misdetected video memory. Make\n" ++"\tRed Hat bugzilla at http://bugzilla.redhat.com indicating that\n"); ++ xf86Msg(X_INFO,"\tyour Nvidia video adaptor has misdetected video memory. Make\n" +"\tsure you attach the X config file \"/etc/X11/XF86Config\",\n" +"\tX server log file \"/var/log/XFree86.0.log\", and the output\n" +"\tof the command \"lspci -vvn\" to the bug report as individual\n" From fedora-cvs-commits at redhat.com Thu Sep 1 10:12:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 06:12:25 -0400 Subject: rpms/xorg-x11/FC-3 XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch, 1.1, 1.2 Message-ID: <200509011012.j81ACPBc030300@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv30260 Modified Files: XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch Log Message: Split very long string into two xf86Msg() calls, as the string has to fit into buffer 1024 chars in length in ErrorF() XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch: riva_hw.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletion(-) Index: XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/FC-3/XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch 9 Sep 2004 14:54:30 -0000 1.1 +++ XFree86-4.3.0-redhat-nv-riva-videomem-autodetection-debugging.patch 1 Sep 2005 10:12:20 -0000 1.2 @@ -95,8 +95,8 @@ +"\tdriver releases, this driver has had the above debugging\n" +"\tinformation added in the autodetection logic by Red Hat. If\n" +"\tyou are seeing this message, please file a bug report in the\n" -+"\tRed Hat bugzilla at http://bugzilla.redhat.com indicating that\n" -+"\tyour Nvidia video adaptor has misdetected video memory. Make\n" ++"\tRed Hat bugzilla at http://bugzilla.redhat.com indicating that\n"); ++ xf86Msg(X_INFO,"\tyour Nvidia video adaptor has misdetected video memory. Make\n" +"\tsure you attach the X config file \"/etc/X11/XF86Config\",\n" +"\tX server log file \"/var/log/XFree86.0.log\", and the output\n" +"\tof the command \"lspci -vvn\" to the bug report as individual\n" From fedora-cvs-commits at redhat.com Thu Sep 1 10:42:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 06:42:25 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch, NONE, 1.1 openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch, NONE, 1.1 openoffice.org-1.9.127.ooo54091.korean.officecfg.patch, NONE, 1.1 openoffice.org-1.9.127.ooo54091.roman.officecfg.patch, NONE, 1.1 openoffice.org.spec, 1.434, 1.435 openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch, 1.3, NONE openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch, 1.6, NONE Message-ID: <200509011042.j81AgPVK010318@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7290 Modified Files: openoffice.org.spec Added Files: openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch openoffice.org-1.9.127.ooo54091.korean.officecfg.patch openoffice.org-1.9.127.ooo54091.roman.officecfg.patch Removed Files: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch Log Message: split font patch, strip unused, and upstream openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch: officecfg/registry/data/org/openoffice/VCL.xcu | 74 ++++++++++++------------- registry/data/org/openoffice/VCL.xcu | 0 2 files changed, 36 insertions(+), 38 deletions(-) --- NEW FILE openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch --- Index: registry/data/org/openoffice/VCL.xcu =================================================================== RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v retrieving revision 1.44 diff -u -r1.44 VCL.xcu --- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 25 Aug 2005 16:10:07 -0000 1.44 +++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 09:57:53 -0000 @@ -492,120 +492,118 @@ - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;MingLiU;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;MingLiU;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;MingLiU;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - FZHeiTi;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + FZHeiTi;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - FZHeiTi;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + FZHeiTi;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch: officecfg/registry/data/org/openoffice/VCL.xcu | 16 ++++++++-------- registry/data/org/openoffice/VCL.xcu | 0 2 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch --- Index: registry/data/org/openoffice/VCL.xcu =================================================================== RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v retrieving revision 1.44 diff -u -r1.44 VCL.xcu --- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 25 Aug 2005 16:10:07 -0000 1.44 +++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 09:47:35 -0000 @@ -460,31 +460,31 @@ - HG ??????L Sun;HG MinchoL Sun;HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG Mincho Light J;MS P ??????;TLP??????;LX??????;IPA P??????;????????????;Kochi Mincho;??????????????????;Mincho;Serif + HG ??????L Sun;HG MinchoL Sun;HG P????????????B Sun;Sazanami Mincho;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG Mincho Light J;MS P ??????;TLP??????;LX??????;IPA P??????;????????????;Kochi Mincho;??????????????????;Mincho;Serif - HG ??????L Sun;HG ??????L;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Gothic;MS ??????;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS P ??????;HG Mincho Light J;MS ????????????;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS P ????????????;Andale Sans UI + HG ??????L Sun;HG ??????L;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Gothic;MS ??????;HG Mincho J;HG Mincho L;HG Mincho;Mincho;Sazanami Mincho;MS P ??????;HG Mincho Light J;MS ????????????;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS P ????????????;Andale Sans UI - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;MS ????????????;MS P ????????????;HG Gothic;HG Gothic B;Gothic;Andale Sans UI + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;Sazanami Gothic;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;MS ????????????;MS P ????????????;HG Gothic;HG Gothic B;Gothic;Andale Sans UI Andale;Arial - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Sazanami Gothic;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;Andale Sans UI;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;Gothic + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;Sazanami Gothic;Andale Sans UI;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;Gothic - HG ????????????B Sun;HG-GothicB Sun;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic + HG ????????????B Sun;HG-GothicB Sun;Sazanami Gothic;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic - HG ????????????B Sun;HG-GothicB Sun;HG ????????????B;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic + HG ????????????B Sun;HG-GothicB Sun;HG ????????????B;Sazanami Gothic;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;Andale Sans UI;HG Mincho Light J;??????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic;Gnu-Unifont + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;Sazanami Gothic;Andale Sans UI;HG Mincho Light J;??????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic;Gnu-Unifont hgmincholightj;cumberland;couriernew;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced openoffice.org-1.9.127.ooo54091.korean.officecfg.patch: officecfg/registry/data/org/openoffice/VCL.xcu | 34 ++++++++++++------------- registry/data/org/openoffice/VCL.xcu | 0 2 files changed, 17 insertions(+), 17 deletions(-) --- NEW FILE openoffice.org-1.9.127.ooo54091.korean.officecfg.patch --- Index: registry/data/org/openoffice/VCL.xcu =================================================================== RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v retrieving revision 1.44 diff -u -r1.44 VCL.xcu --- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 25 Aug 2005 16:10:07 -0000 1.44 +++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 10:02:36 -0000 @@ -610,55 +610,55 @@ - ?????????;SunGulim;??????;Gulim;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ?????????;SunDotum;??????;Dotum;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunBatang;??????;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Baekmuk Dotum;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunDotum;??????;Dotum;????????????;BaekmukDotum;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;????????????;BaekmukDotum;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic - ?????????;SunBatang;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunBatang;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunDotum;??????;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunGulim;??????;Gulim;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif - ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Baekmuk Dotum;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif - ?????????;SunGulim;??????;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Roundgothic;Andale Sans UI;Arial Unicode MS - ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunBatang;??????;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunGulim;??????;Gulim;??????;Batang;Myeongjo;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunGulim;??????;Gulim;??????;Batang;Myeongjo;Baekmuk Dotum;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunDotum;??????;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunBatang;??????;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunGulim;??????;Gulim;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ?????????;sungulim;??????;Gulim;RoundGothic;Arial Unicode MS;Lucida Sans Unicode;AndaleSansUI;GNU-Unifont + ?????????;sungulim;??????;Gulim;Baekmuk Dotum;RoundGothic;Arial Unicode MS;Lucida Sans Unicode;AndaleSansUI;GNU-Unifont - ?????????;SunGulim;;??????;Gulim;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ?????????;SunGulim;;??????;Gulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced openoffice.org-1.9.127.ooo54091.roman.officecfg.patch: officecfg/registry/data/org/openoffice/VCL.xcu | 38 ++++++++++++------------- registry/data/org/openoffice/VCL.xcu | 0 2 files changed, 19 insertions(+), 19 deletions(-) --- NEW FILE openoffice.org-1.9.127.ooo54091.roman.officecfg.patch --- Index: registry/data/org/openoffice/VCL.xcu =================================================================== RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v retrieving revision 1.44 diff -u -r1.44 VCL.xcu --- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 25 Aug 2005 16:10:07 -0000 1.44 +++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 09:51:48 -0000 @@ -94,7 +94,7 @@ Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma @@ -127,7 +127,7 @@ Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif - Thorndale;Times New Roman;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol @@ -163,13 +163,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -198,13 +198,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -233,13 +233,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -268,13 +268,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -303,13 +303,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -338,13 +338,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -373,13 +373,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -619,13 +619,13 @@ ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma ?????????;SunDotum;??????;Dotum;????????????;BaekmukDotum;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic - ?????????;SunBatang;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunBatang;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma ?????????;SunDotum;??????;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma @@ -634,7 +634,7 @@ ?????????;SunGulim;??????;Gulim;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif - ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif ?????????;SunGulim;??????;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.434 retrieving revision 1.435 diff -u -r1.434 -r1.435 --- openoffice.org.spec 1 Sep 2005 08:44:26 -0000 1.434 +++ openoffice.org.spec 1 Sep 2005 10:42:23 -0000 1.435 @@ -123,57 +123,59 @@ Patch3: openoffice.org-1.9.87.rh151357.setlangtolocale.patch Patch4: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch Patch5: openoffice.org-1.9.97.rh156067.noversionedicons.patch -Patch6: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch -Patch7: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch -Patch8: openoffice.org-1.9.121.rh127576.gnomeprintui.patch -Patch9: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch -Patch10: openoffice.org-1.9.74.ooo41875.mktemp.patch -Patch11: openoffice.org-1.9.84.ooo44843.sdcasting.patch -Patch12: openoffice.org-1.9.84.ooo44846.svxcasting.patch -Patch13: openoffice.org-1.9.84.ooo45162.svxcasting2.patch -Patch14: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch -Patch15: openoffice.org-1.9.87.warnnoterroronmissing.patch -Patch16: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch -Patch17: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch -Patch18: openoffice.org-1.9.89.ooo44027.pthreadchange.patch -Patch19: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch -Patch20: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch -Patch21: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch -Patch22: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch -Patch23: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch -Patch24: openoffice.org-1.9.104-use-fontconfig-everywhere.patch -Patch25: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch -Patch26: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch -Patch27: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch -Patch28: workspace.vcl39.patch -Patch29: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch -Patch30: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch -Patch31: openoffice.org-1.9.88.NONE.gcc3gcj4.patch -Patch32: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch -Patch33: openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch -Patch34: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch -Patch35: openoffice.org-1.9.114.ooo51718.rpath.patch -Patch36: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch -Patch37: openoffice.org-1.9.114.ooo51638.mailmerge.patch -Patch38: openoffice.org-1.9.114.oooXXXXX.nostlport.patch -Patch39: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch -Patch40: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch -Patch41: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch -Patch42: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch -Patch43: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch -Patch44: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch -Patch45: workspace.javapatch.patch -Patch46: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch -Patch47: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch -Patch48: openoffice.org-1.9.112.ooo53025.exception.package.patch -Patch49: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch -Patch50: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch -Patch51: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch -Patch52: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch -Patch53: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch -Patch54: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch -Patch55: workspace.impress57.patch -Patch56: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch +Patch6: openoffice.org-1.9.121.rh127576.gnomeprintui.patch +Patch7: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch +Patch8: openoffice.org-1.9.74.ooo41875.mktemp.patch +Patch9: openoffice.org-1.9.84.ooo44843.sdcasting.patch +Patch10: openoffice.org-1.9.84.ooo44846.svxcasting.patch +Patch11: openoffice.org-1.9.84.ooo45162.svxcasting2.patch +Patch12: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch +Patch13: openoffice.org-1.9.87.warnnoterroronmissing.patch +Patch14: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch +Patch15: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch +Patch16: openoffice.org-1.9.89.ooo44027.pthreadchange.patch +Patch17: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch +Patch18: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch +Patch19: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch +Patch20: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch +Patch21: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch +Patch22: openoffice.org-1.9.104-use-fontconfig-everywhere.patch +Patch23: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch +Patch24: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch +Patch25: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch +Patch26: workspace.vcl39.patch +Patch27: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch +Patch28: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch +Patch29: openoffice.org-1.9.88.NONE.gcc3gcj4.patch +Patch30: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch +Patch31: openoffice.org-1.9.112.ooo51724.gcc21020.testtools.patch +Patch32: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch +Patch33: openoffice.org-1.9.114.ooo51718.rpath.patch +Patch34: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch +Patch35: openoffice.org-1.9.114.ooo51638.mailmerge.patch +Patch36: openoffice.org-1.9.114.oooXXXXX.nostlport.patch +Patch37: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch +Patch38: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch +Patch39: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch +Patch40: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch +Patch41: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch +Patch42: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch +Patch43: workspace.javapatch.patch +Patch44: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch +Patch45: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch +Patch46: openoffice.org-1.9.112.ooo53025.exception.package.patch +Patch47: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch +Patch48: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch +Patch49: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch +Patch50: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch +Patch51: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch +Patch52: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch +Patch53: workspace.impress57.patch +Patch54: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch +Patch55: openoffice.org-1.9.127.ooo54091.korean.officecfg.patch +Patch56: openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch +Patch57: openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch +Patch58: openoffice.org-1.9.127.ooo54091.roman.officecfg.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -773,63 +775,65 @@ %patch3 -p1 -b .rh151357.setlangtolocale.patch %patch4 -p1 -b .rh151356.usetwodotzeropath.patch %patch5 -p1 -b .rh156067.noversionedicons.patch -%patch6 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch -%patch7 -p1 -b .rh163147.thorndale.fontconfig.patch %if %{build_fc5} -%patch8 -p1 -b .rh127576.gnomeprintui.patch +%patch6 -p1 -b .rh127576.gnomeprintui.patch %endif %if %{cripplemenus} -%patch9 -p1 -b .rh156677.cripplemenus.sysui.patch +%patch7 -p1 -b .rh156677.cripplemenus.sysui.patch %endif -%patch10 -p1 -b .ooo41875.mktemp.patch -%patch11 -p1 -b .ooo44843.sdcasting.patch -%patch12 -p1 -b .ooo44846.svxcasting.patch -%patch13 -p1 -b .ooo45162.svxcasting2.patch -%patch14 -p1 -b .ooo45725.lingucomponent.contribdict.patch -%patch15 -p1 -b .warnnoterroronmissing.patch -%patch16 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch -%patch17 -p1 -b .ooo35627.parallel.cppumaker.patch -%patch18 -p1 -b .ooo44027.pthreadchange.patch -%patch19 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch -%patch20 -p1 -b .ooo35641.noxfonts.vcl.patch -%patch21 -p1 -b .ooo48256.nolongname.sysui.patch -%patch22 -p1 -b .ooo48600.rtfparseerror.svx.patch -%patch23 -p1 -b .ooo48610.searchalltemplates.wizards.patch -%patch24 -p1 -b .use-fontconfig-everywhere.patch -%patch25 -p1 -b .berkeleydb-jni-casting-misuse.patch -%patch26 -p1 -b .ooo44627.sal.brokencondition.patch -%patch27 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch -%patch28 -p1 -b .workspace.vcl39.patch -%patch29 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch -%patch30 -p1 -b .ooo47323.binfilter.stupiddetect.patch -%patch31 -p1 -b .NONE.gcc3gcj4.patch -%patch32 -p1 -b .ooo9290.goodies.epstoepdf.patch -%patch33 -p1 -b .ooo51724.gcc21020.testtools.patch -%patch34 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch -%patch35 -p1 -b .ooo51718.rpath.patch -%patch36 -p1 -b .ooo51637.solenv.pyuno.patch +%patch8 -p1 -b .ooo41875.mktemp.patch +%patch9 -p1 -b .ooo44843.sdcasting.patch +%patch10 -p1 -b .ooo44846.svxcasting.patch +%patch11 -p1 -b .ooo45162.svxcasting2.patch +%patch12 -p1 -b .ooo45725.lingucomponent.contribdict.patch +%patch13 -p1 -b .warnnoterroronmissing.patch +%patch14 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch +%patch15 -p1 -b .ooo35627.parallel.cppumaker.patch +%patch16 -p1 -b .ooo44027.pthreadchange.patch +%patch17 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch +%patch18 -p1 -b .ooo35641.noxfonts.vcl.patch +%patch19 -p1 -b .ooo48256.nolongname.sysui.patch +%patch20 -p1 -b .ooo48600.rtfparseerror.svx.patch +%patch21 -p1 -b .ooo48610.searchalltemplates.wizards.patch +%patch22 -p1 -b .use-fontconfig-everywhere.patch +%patch23 -p1 -b .berkeleydb-jni-casting-misuse.patch +%patch24 -p1 -b .ooo44627.sal.brokencondition.patch +%patch25 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch +%patch26 -p1 -b .workspace.vcl39.patch +%patch27 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch +%patch28 -p1 -b .ooo47323.binfilter.stupiddetect.patch +%patch29 -p1 -b .NONE.gcc3gcj4.patch +%patch30 -p1 -b .ooo9290.goodies.epstoepdf.patch +%patch31 -p1 -b .ooo51724.gcc21020.testtools.patch +%patch32 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch +%patch33 -p1 -b .ooo51718.rpath.patch +%patch34 -p1 -b .ooo51637.solenv.pyuno.patch %if %{includeemailmerge} -%patch37 -p1 -b .ooo51638.mailmerge.patch +%patch35 -p1 -b .ooo51638.mailmerge.patch %endif -%patch38 -p1 -b .oooXXXXX.nostlport.patch -%patch39 -p1 -b .ooo51931.systemxmlsec.patch -%patch40 -p1 -b .oooXXXXX.extensions.evolution.patch -%patch41 -p1 -b .ooo51912.nullpointer.wizards.patch -%patch42 -p1 -b .ooo52023.evoadb2.nognuconst.patch -%patch43 -p1 -b .ooo49720.mozillanspr.extensions.patch -%patch44 -p1 -b .ooo52428.execshield.bridges.patch -%patch45 -p1 -b .workspace.javapatch.patch -%patch46 -p1 -b .ooo52974.systemhsqldbbeanshell.patch -%patch47 -p1 -b .ooo52626.workspacerestore.vcl.patch -%patch48 -p1 -b .ooo53025.exception.package.patch -%patch49 -p1 -b .ooo53397.prelinkoptimize.desktop.patch -%patch50 -p1 -b .ooo53612.systemnp_sdk.extensions.patch -%patch51 -p1 -b .ooo53682.nfslock.sal.patch -%patch52 -p1 -b .ooo53699.uzipunused.postprocess.patch -%patch53 -p1 -b .ooo53723.bulletexport.vcl.patch -%patch54 -p1 -b .oooXXXXX.uselibxslt.xmlhelp.patch -%patch55 -p1 -b .workspace.impress57.patch -%patch56 -p1 -b .ooo54040.savecrash.svtools.patch +%patch36 -p1 -b .oooXXXXX.nostlport.patch +%patch37 -p1 -b .ooo51931.systemxmlsec.patch +%patch38 -p1 -b .oooXXXXX.extensions.evolution.patch +%patch39 -p1 -b .ooo51912.nullpointer.wizards.patch +%patch40 -p1 -b .ooo52023.evoadb2.nognuconst.patch +%patch41 -p1 -b .ooo49720.mozillanspr.extensions.patch +%patch42 -p1 -b .ooo52428.execshield.bridges.patch +%patch43 -p1 -b .workspace.javapatch.patch +%patch44 -p1 -b .ooo52974.systemhsqldbbeanshell.patch +%patch45 -p1 -b .ooo52626.workspacerestore.vcl.patch +%patch46 -p1 -b .ooo53025.exception.package.patch +%patch47 -p1 -b .ooo53397.prelinkoptimize.desktop.patch +%patch48 -p1 -b .ooo53612.systemnp_sdk.extensions.patch +%patch49 -p1 -b .ooo53682.nfslock.sal.patch +%patch50 -p1 -b .ooo53699.uzipunused.postprocess.patch +%patch51 -p1 -b .ooo53723.bulletexport.vcl.patch +%patch52 -p1 -b .oooXXXXX.uselibxslt.xmlhelp.patch +%patch53 -p1 -b .workspace.impress57.patch +%patch54 -p1 -b .ooo54040.savecrash.svtools.patch +%patch55 -p1 -b .ooo54091.korean.officecfg.patch +%patch56 -p1 -b .ooo54091.japanese.officecfg.patch +%patch57 -p1 -b .ooo54091.chinese.officecfg.patch +%patch58 -p1 -b .ooo54091.roman.officecfg.patch %if %{includeexternals} #start ludicrous workaround @@ -968,6 +972,14 @@ #add our custom configuration options $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE6} +# rh#163147# convert non AMT to AMT fonts +sed -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded +mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded +mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded +mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu + #rh#158977# clear execstack requirement execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so @@ -3130,6 +3142,7 @@ - add plausible .ooo54040.savecrash.svtools.patch fix for rh#167178# - drop integrated workspace.cmcfixes15.patch - drop integrated workspace.cmcfixes16.patch +- split and upstream font additions * Sat Aug 27 2005 Caolan McNamara - 1:1.9.126-1 - next version --- openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch DELETED --- --- openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Sep 1 10:50:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 06:50:44 -0400 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.435, 1.436 openoffice.org-1.9.127.ooo54091.roman.officecfg.patch, 1.1, NONE Message-ID: <200509011050.j81AoikS016123@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16111 Modified Files: openoffice.org.spec Removed Files: openoffice.org-1.9.127.ooo54091.roman.officecfg.patch Log Message: add Nimbus Roman No9 L at install time Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.435 retrieving revision 1.436 diff -u -r1.435 -r1.436 --- openoffice.org.spec 1 Sep 2005 10:42:23 -0000 1.435 +++ openoffice.org.spec 1 Sep 2005 10:50:42 -0000 1.436 @@ -175,7 +175,6 @@ Patch55: openoffice.org-1.9.127.ooo54091.korean.officecfg.patch Patch56: openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch Patch57: openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch -Patch58: openoffice.org-1.9.127.ooo54091.roman.officecfg.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -779,7 +778,7 @@ %patch6 -p1 -b .rh127576.gnomeprintui.patch %endif %if %{cripplemenus} -%patch7 -p1 -b .rh156677.cripplemenus.sysui.patch +%patch7 -p1 -b .rh156677.cripplemenus.sysui.patch %endif %patch8 -p1 -b .ooo41875.mktemp.patch %patch9 -p1 -b .ooo44843.sdcasting.patch @@ -833,7 +832,6 @@ %patch55 -p1 -b .ooo54091.korean.officecfg.patch %patch56 -p1 -b .ooo54091.japanese.officecfg.patch %patch57 -p1 -b .ooo54091.chinese.officecfg.patch -%patch58 -p1 -b .ooo54091.roman.officecfg.patch %if %{includeexternals} #start ludicrous workaround @@ -980,6 +978,11 @@ sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +# ooo#ooo54091# add Nimbus Roman No9 L as Times New Roman fallback +sed -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded +mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu + + #rh#158977# clear execstack requirement execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so --- openoffice.org-1.9.127.ooo54091.roman.officecfg.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Sep 1 11:00:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 07:00:33 -0400 Subject: rpms/xorg-x11/devel xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch, NONE, 1.1 xorg-x11.spec, 1.221, 1.222 Message-ID: <200509011100.j81B0XlW026895@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26866 Modified Files: xorg-x11.spec Added Files: xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch Log Message: Merge xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch patch from RHEL-4 branch xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch: radeon_driver.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletion(-) --- NEW FILE xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch --- --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.RV100_dell_bus_master_fix 2005-07-28 09:58:30.026778717 -0400 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-07-28 10:02:23.136972800 -0400 @@ -1994,7 +1994,10 @@ unsigned char *RADEONMMIO = info->MMIO; CARD32 mc_fb_location; CARD32 mc_agp_location = INREG(RADEON_MC_AGP_LOCATION); - + CARD32 bus_cntl = INREG(RADEON_BUS_CNTL); + + OUTREG (RADEON_BUS_CNTL, bus_cntl | RADEON_BUS_MASTER_DIS); + RADEONWaitForIdleMMIO(pScrn); /* This function has many problems with newer cards. * Even with older cards, all registers changed here are not @@ -2014,6 +2017,9 @@ OUTREG(RADEON_DISPLAY2_BASE_ADDR, info->fbLocation); OUTREG(RADEON_OV0_BASE_ADDR, info->fbLocation); } + OUTREG (RADEON_BUS_CNTL, bus_cntl); + RADEONWaitForIdleMMIO(pScrn); + return; } @@ -2053,6 +2059,8 @@ if (info->HasCRTC2) OUTREG(RADEON_DISPLAY2_BASE_ADDR, info->fbLocation); OUTREG(RADEON_OV0_BASE_ADDR, info->fbLocation); + OUTREG (RADEON_BUS_CNTL, bus_cntl); + RADEONWaitForIdleMMIO(pScrn); } static void RADEONGetVRamType(ScrnInfoPtr pScrn) Index: xorg-x11.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- xorg-x11.spec 29 Jul 2005 17:11:16 -0000 1.221 +++ xorg-x11.spec 1 Sep 2005 11:00:29 -0000 1.222 @@ -375,6 +375,7 @@ Patch1214: XFree86-4.3.0-radeon-disable-VideoRAM-option.patch Patch1215: xorg-x11-6.8.1-ati-radeon-disable-dri.patch Patch1216: xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch +Patch1218: xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch # Patches 1300-1319: chips driver patches Patch1300: XFree86-4.2.99.901-chips-default-to-noaccel-on-69000.patch @@ -1081,6 +1082,7 @@ #%patch1215 -p0 -b .ati-radeon-disable-dri %endif %patch1216 -p0 -b .ati-radeon-7000-disable-dri +%patch1218 -p0 -b .ati-radeon-RV100-bus-master-fix # FIXME: Chips & technologies - Disable these two for now, to see if the # problems are resolved that these two worked around. @@ -3603,6 +3605,12 @@ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %changelog + +* Thu Sep 1 2005 Mike A. Harris 6.8.2-46 +- Added following patches, merged over from RHEL-4 branch of CVS: + - Added xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch for bug (#165179) + - Added xorg-x11-6.8.2-add-i945-support.patch to fix (#156964) + * Fri Jul 29 2005 Kristian H??gsberg 6.8.2-45 - Disable xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch and rebuild with gcc-4.0.1-4 which has a workaround for the gcc From fedora-cvs-commits at redhat.com Thu Sep 1 11:00:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 07:00:33 -0400 Subject: rpms/xorg-x11/FC-4 xorg-x11.spec,1.206,1.207 Message-ID: <200509011100.j81B0Xrc026889@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26865 Modified Files: xorg-x11.spec Log Message: Merge xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch patch from RHEL-4 branch Index: xorg-x11.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- xorg-x11.spec 1 Sep 2005 00:11:55 -0000 1.206 +++ xorg-x11.spec 1 Sep 2005 11:00:26 -0000 1.207 @@ -381,6 +381,7 @@ Patch1214: XFree86-4.3.0-radeon-disable-VideoRAM-option.patch Patch1215: xorg-x11-6.8.1-ati-radeon-disable-dri.patch Patch1216: xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch +Patch1218: xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch # Patches 1300-1319: chips driver patches Patch1300: XFree86-4.2.99.901-chips-default-to-noaccel-on-69000.patch @@ -1087,6 +1088,7 @@ #%patch1215 -p0 -b .ati-radeon-disable-dri %endif %patch1216 -p0 -b .ati-radeon-7000-disable-dri +%patch1218 -p0 -b .ati-radeon-RV100-bus-master-fix # FIXME: Chips & technologies - Disable these two for now, to see if the # problems are resolved that these two worked around. @@ -3605,6 +3607,11 @@ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 1 2005 Mike A. Harris 6.8.2-46 +- Added following patches, merged over from RHEL-4 branch of CVS: + - Added xorg-x11-6.8.1-ati-radeon-RV100-bus-master-fix.patch for bug (#165179) + - Added xorg-x11-6.8.2-add-i945-support.patch to fix (#156964) + * Wed Aug 31 2005 Mike A. Harris 6.8.2-37.FC4.45 - Merge developmental changes from FC "devel" branch of CVS into FC4 branch for FC4 update. From fedora-cvs-commits at redhat.com Thu Sep 1 11:17:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 07:17:47 -0400 Subject: rpms/anthy/devel anthy-add-placename-dict.patch, NONE, 1.1 anthy.spec, 1.8, 1.9 Message-ID: <200509011117.j81BHleY007002@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6966 Modified Files: anthy.spec Added Files: anthy-add-placename-dict.patch Log Message: * Thu Sep 1 2005 Akira TAGOH - 6829-2 - Added the place name dictionary. anthy-add-placename-dict.patch: dict.args.in | 1 + 1 files changed, 1 insertion(+) --- NEW FILE anthy-add-placename-dict.patch --- diff -ruN anthy-6829.orig/mkanthydic/dict.args.in anthy-6829/mkanthydic/dict.args.in --- anthy-6829.orig/mkanthydic/dict.args.in 2005-08-29 00:05:24.000000000 +0900 +++ anthy-6829/mkanthydic/dict.args.in 2005-09-01 14:24:35.000000000 +0900 @@ -8,6 +8,7 @@ # read @top_srcdir@/cannadic/gcanna.ctd read @top_srcdir@/cannadic/gcannaf.ctd +read @top_srcdir@/mkanthydic/placename.t read @top_srcdir@/mkanthydic/katakana.t read @top_srcdir@/mkanthydic/adjust.t read @top_srcdir@/mkanthydic/name.t Index: anthy.spec =================================================================== RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- anthy.spec 30 Aug 2005 03:09:05 -0000 1.8 +++ anthy.spec 1 Sep 2005 11:17:44 -0000 1.9 @@ -1,8 +1,9 @@ %define version 6829 +%define zipcode_ver 20050831 Name: anthy Version: %{version} -Release: 1 +Release: 2 License: GPL URL: http://sourceforge.jp/projects/anthy/ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot @@ -11,6 +12,9 @@ Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el +Source2: zipcode-%{zipcode_ver}.tar.bz2 + +Patch0: anthy-add-placename-dict.patch Summary: Japanese character set input library Group: System Environment/Libraries @@ -49,7 +53,9 @@ #character set on XEmacs. %prep -%setup -q +%setup -q -a 2 +%patch0 -p1 -b .placename-dict +cp zipcode-%{zipcode_ver}/placename.t mkanthydic/ %build %configure @@ -60,6 +66,9 @@ %makeinstall +## for zipcode.t +install -m 644 zipcode-%{zipcode_ver}/zipcode.t $RPM_BUILD_ROOT%{_datadir}/anthy/ + ## for anthy-el %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d @@ -103,6 +112,9 @@ #%%{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Thu Sep 1 2005 Akira TAGOH - 6829-2 +- Added the place name dictionary. + * Tue Aug 30 2005 Akira TAGOH - 6829-1 - New upstream snapshot release. From fedora-cvs-commits at redhat.com Thu Sep 1 11:21:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 07:21:52 -0400 Subject: rpms/anthy/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200509011121.j81BLqHp008992@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8956 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Aug 2005 03:09:05 -0000 1.5 +++ .cvsignore 1 Sep 2005 11:21:48 -0000 1.6 @@ -6,3 +6,4 @@ anthy-6700b.tar.gz anthy-6801.tar.gz anthy-6829.tar.gz +zipcode-20050831.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/anthy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Aug 2005 03:09:05 -0000 1.5 +++ sources 1 Sep 2005 11:21:48 -0000 1.6 @@ -1 +1,2 @@ 6080437e98b7443682c047afd035f306 anthy-6829.tar.gz +50aaa4dc35ffed764d40abd52efd1036 zipcode-20050831.tar.bz2 From fedora-cvs-commits at redhat.com Thu Sep 1 11:46:35 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 07:46:35 -0400 Subject: rpms/shadow-utils/devel shadow-4.0.12-audit.patch, NONE, 1.1 shadow-utils.spec, 1.56, 1.57 Message-ID: <200509011146.j81BkZxl025675@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25594 Modified Files: shadow-utils.spec Added Files: shadow-4.0.12-audit.patch Log Message: audit support shadow-4.0.12-audit.patch: config.h.in | 3 configure.in | 9 ++ lib/defines.h | 5 + lib/prototypes.h | 12 +++ libmisc/Makefile.am | 1 libmisc/audit_help.c | 77 +++++++++++++++++++++++ src/Makefile.am | 16 ++-- src/chage.c | 44 +++++++++++++ src/gpasswd.c | 57 +++++++++++++++-- src/groupadd.c | 8 ++ src/groupdel.c | 11 +++ src/groupmod.c | 22 ++++++ src/useradd.c | 19 +++++ src/userdel.c | 33 +++++++++- src/usermod.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++-- 15 files changed, 459 insertions(+), 24 deletions(-) --- NEW FILE shadow-4.0.12-audit.patch --- --- shadow-4.0.12/configure.in.audit 2005-08-10 17:47:31.000000000 +0000 +++ shadow-4.0.12/configure.in 2005-09-01 13:04:03.000000000 +0000 @@ -211,6 +211,7 @@ [enable_shadowgrp="yes"] ) +AC_ARG_WITH(libaudit, [ --with-audit try to use audit (default if found)]) AC_ARG_WITH(libcrack, [ --with-libcrack try to use libcrack (default if found)]) AC_ARG_WITH(libpam, [ --with-libpam use libpam for PAM support]) AC_ARG_WITH(selinux, [ --with-selinux use SELinux support]) @@ -232,6 +233,14 @@ AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt], [AC_MSG_ERROR([crypt() not found])]) +AC_SUBST(AUDIT) +if test "$with_audit" != "no"; then + AC_CHECK_HEADER(libaudit.h, [ audit_header="yes" ], [ audit_header="no" ]) + if test "$audit_header" = "yes"; then + AC_CHECK_LIB(audit, audit_send_message_if_enabled, AC_DEFINE(WITH_AUDIT,1,[Define if you want to enable Audit messages]) [LIBS="-Wl,-Bstatic -laudit -Wl,-dy $LIBS"]) + fi +fi + AC_SUBST(LIBCRACK) if test "$with_libcrack" = "yes"; then echo "checking cracklib flavour, don't be surprised by the results" --- shadow-4.0.12/lib/prototypes.h.audit 2005-08-02 10:50:51.000000000 +0000 +++ shadow-4.0.12/lib/prototypes.h 2005-09-01 13:04:03.000000000 +0000 @@ -87,6 +87,18 @@ /* hushed.c */ extern int hushed (const struct passwd *); +/* audit_help.c */ +#ifdef WITH_AUDIT +extern int audit_fd; +#endif +void audit_help_open(void); +void audit_help_log(const char *, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 1, 2))); +#else + ; +#endif + /* limits.c */ extern void setup_limits (const struct passwd *); --- shadow-4.0.12/lib/defines.h.audit 2005-08-09 16:40:05.000000000 +0000 +++ shadow-4.0.12/lib/defines.h 2005-09-01 13:04:03.000000000 +0000 @@ -331,4 +331,9 @@ #define SHADOW_PASSWD_STRING "x" #endif +#ifdef WITH_AUDIT +#include +#endif + #endif /* _DEFINES_H_ */ + --- shadow-4.0.12/libmisc/Makefile.am.audit 2005-07-07 08:42:13.000000000 +0000 +++ shadow-4.0.12/libmisc/Makefile.am 2005-09-01 13:04:03.000000000 +0000 @@ -24,6 +24,7 @@ getdate.h \ hushed.c \ isexpired.c \ + audit_help.c \ limits.c \ list.c log.c \ loginprompt.c \ --- /dev/null 2005-08-17 17:31:20.904387280 +0000 +++ shadow-4.0.12/libmisc/audit_help.c 2005-09-01 13:04:03.000000000 +0000 @@ -0,0 +1,77 @@ +/* + * Audit helper functions used throughout shadow-utils + * + * Copyright (C) 2005, Red Hat, Inc. + * + * Redistributable under the same terms as the other elements of + * shadow-utils v4.0.3. + */ + +#include + +#ifdef WITH_AUDIT +#include +#include +#include +#include +#include +#include +int audit_fd; +#endif + +void audit_help_open(void) +{ +#ifdef WITH_AUDIT + audit_fd = audit_open(); + if (audit_fd < 0) { + /* You get these only when the kernel doesn't have + * audit compiled in. */ + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) + return; + fprintf(stderr, "Cannot open audit interface - aborting.\n"); + exit(1); + } +#endif +} + +/* + * This function will log a message to the audit system using a predefined + * message format. Parameter usage is as follows: + * + * type - type of message: AUDIT_USER_CHAUTHTOK for changing any account + * attributes. + * pgname - program's name + * op - operation. "adding user", "changing finger info", "deleting group" + * name - user's account or group name. If not available use NULL. + * id - uid or gid that the operation is being performed on. This is used + * only when user is NULL. + * result - 1 is "success" and 0 is "failed" + */ +void audit_logger(int type, const char *pgname, const char *op, + const char *name, unsigned int id, int result) +{ +#ifdef WITH_AUDIT + if (audit_fd < 0) + return; + else { + char buf[PATH_MAX]; + const char *success; + + if (result) + success = "success"; + else + success = "failed"; + + if (name) + snprintf(buf, sizeof(buf), "%s: op=%s acct=%s res=%s", + pgname, op, name, success); + else + snprintf(buf, sizeof(buf), "%s: op=%s id=%u res=%s", + pgname, op, id, success); + + audit_send_user_message(audit_fd, type, buf); + } +#endif +} + --- shadow-4.0.12/src/groupdel.c.audit 2005-09-01 13:04:03.000000000 +0000 +++ shadow-4.0.12/src/groupdel.c 2005-09-01 13:04:03.000000000 +0000 @@ -47,6 +47,7 @@ static char *group_name; static char *Prog; static int errors; +static gid_t group_id = -1; #include "groupio.h" @@ -105,6 +106,7 @@ errors++; } #endif /* SHADOWGRP */ + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", group_name,group_id,1); SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name)); return; } @@ -229,6 +231,8 @@ int retval; #endif + audit_help_open(); + /* * Get my name so that I can use it to report errors. */ @@ -293,8 +297,12 @@ if (!(grp = getgrnam (group_name))) { fprintf (stderr, _("%s: group %s does not exist\n"), Prog, group_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", group_name,-1,0); exit (E_NOTFOUND); } + + group_id = grp->gr_gid; /* LAUS */ + #ifdef USE_NIS /* * Make sure this isn't a NIS group @@ -306,6 +314,7 @@ fprintf (stderr, _("%s: group %s is a NIS group\n"), Prog, group_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", group_name,-1,0); if (!yp_get_default_domain (&nis_domain) && !yp_master (nis_domain, "group.byname", &nis_master)) { fprintf (stderr, _("%s: %s is the NIS master\n"), @@ -348,6 +357,8 @@ if (retval == PAM_SUCCESS) pam_end (pamh, PAM_SUCCESS); #endif /* USE_PAM */ + if(errors != 0) + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", group_name,-1,0); exit (errors == 0 ? E_SUCCESS : E_GRP_UPDATE); /* NOT REACHED */ } --- shadow-4.0.12/src/groupadd.c.audit 2005-09-01 13:04:03.000000000 +0000 +++ shadow-4.0.12/src/groupadd.c 2005-09-01 13:04:03.000000000 +0000 @@ -182,6 +182,7 @@ fail_exit (E_GRP_UPDATE); } #endif /* SHADOWGRP */ + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group", group_name,group_id,1); SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u", group_name, (unsigned int) group_id)); } @@ -334,10 +335,12 @@ { if (!gr_lock ()) { fprintf (stderr, _("%s: unable to lock group file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking group file", group_name,-1,0); exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { fprintf (stderr, _("%s: unable to open group file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening group file", group_name,-1,0); fail_exit (E_GRP_UPDATE); } #ifdef SHADOWGRP @@ -365,6 +368,8 @@ if (is_shadow_grp) sgr_unlock (); #endif + if(code != E_SUCCESS) + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group", group_name,-1,0); exit (code); } @@ -388,6 +393,8 @@ int retval; #endif + audit_help_open(); + /* * Get my name so that I can use it to report errors. */ @@ -539,6 +546,7 @@ exit (E_SUCCESS); } fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group", group_name,-1,0); exit (E_NAME_IN_USE); } --- shadow-4.0.12/src/useradd.c.audit 2005-09-01 13:04:03.000000000 +0000 +++ shadow-4.0.12/src/useradd.c 2005-09-01 13:04:03.000000000 +0000 @@ -193,6 +193,7 @@ if (home_added) rmdir (user_home); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user", user_name,-1, 0); SYSLOG ((LOG_INFO, "failed adding user `%s', data deleted", user_name)); exit (code); } @@ -512,6 +513,7 @@ perror (buf); return -1; } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing user defaults", NULL,-1, 1); SYSLOG ((LOG_INFO, "useradd defaults: GROUP=%u, HOME=%s, SHELL=%s, INACTIVE=%ld, " "EXPIRE=%s, SKEL=%s, CREATE_MAIL_SPOOL=%s", @@ -801,6 +803,7 @@ "%s: error adding new group entry\n", Prog); fail_exit (E_GRP_UPDATE); } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user to group", user_name,-1, 1); SYSLOG ((LOG_INFO, "add `%s' to group `%s'", user_name, ngrp->gr_name)); } @@ -849,6 +852,7 @@ _("%s: error adding new group entry\n"), Prog); fail_exit (E_GRP_UPDATE); } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user to shadow group", user_name,-1, 1); SYSLOG ((LOG_INFO, "add `%s' to shadow group `%s'", user_name, nsgrp->sg_name)); } @@ -901,11 +905,13 @@ if (strcmp (user_name, pwd->pw_name) == 0) { fprintf (stderr, _("%s: name %s is not unique\n"), Prog, user_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user", user_name,user_id, 0); exit (E_NAME_IN_USE); } if (!oflg && uflg && user_id == pwd->pw_uid) { fprintf (stderr, _("%s: UID %u is not unique\n"), Prog, (unsigned int) user_id); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user", user_name,user_id, 0); exit (E_UID_IN_USE); } if (!uflg && pwd->pw_uid >= user_id) { @@ -1277,6 +1283,7 @@ _ ("%s: invalid user name '%s'\n"), Prog, user_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user", user_name,-1, 0); exit (E_BAD_ARG); } if (!dflg) { @@ -1351,22 +1358,26 @@ { if (!pw_lock ()) { fprintf (stderr, _("%s: unable to lock password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking password file", user_name,user_id, 0); exit (E_PW_UPDATE); } if (!pw_open (O_RDWR)) { fprintf (stderr, _("%s: unable to open password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening password file", user_name,user_id, 0); pw_unlock (); exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_lock ()) { fprintf (stderr, _("%s: cannot lock shadow password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking shadow password file", user_name,user_id, 0); pw_unlock (); exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_open (O_RDWR)) { fprintf (stderr, _("%s: cannot open shadow password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening shadow password file", user_name,user_id, 0); spw_unlock (); pw_unlock (); exit (E_PW_UPDATE); @@ -1569,9 +1580,12 @@ _ ("%s: error adding new shadow password entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding shadow password", user_name,user_id, 0); exit (E_PW_UPDATE); } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user", user_name, user_id, 1); + /* * Do any group file updates for this user. */ @@ -1602,6 +1616,7 @@ chown (user_home, user_id, user_gid); chmod (user_home, 0777 & ~getdef_num ("UMASK", 022)); home_added++; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding home directory", user_name, user_id, 1); } } @@ -1676,6 +1691,8 @@ struct passwd *pampw; int retval; #endif + + audit_help_open(); /* * Get my name so that I can use it to report errors. @@ -1765,6 +1782,7 @@ if (getpwnam (user_name)) { fprintf (stderr, _("%s: user %s exists\n"), Prog, user_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user", user_name,-1, 0); exit (E_NAME_IN_USE); } @@ -1780,6 +1798,7 @@ _ ("%s: group %s exists - if you want to add this user to that group, use -g.\n"), Prog, user_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group", user_name,-1, 0); exit (E_NAME_IN_USE); } } --- shadow-4.0.12/src/userdel.c.audit 2005-09-01 13:04:03.000000000 +0000 +++ shadow-4.0.12/src/userdel.c 2005-09-01 13:04:03.000000000 +0000 @@ -159,8 +159,8 @@ /* * Update the DBM group file with the new entry as well. - */ - + */ + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting user from group", user_name,user_id, 0); SYSLOG ((LOG_INFO, "delete `%s' from group `%s'\n", user_name, ngrp->gr_name)); } @@ -180,6 +180,7 @@ deleted_user_group = 1; #endif + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", user_name,user_id, 0); SYSLOG ((LOG_INFO, "removed group `%s' owned by `%s'\n", grp->gr_name, user_name)); } @@ -221,6 +222,7 @@ if (!sgr_update (nsgrp)) fprintf (stderr, _("%s: error updating group entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting user from shadow group", user_name,user_id, 0); SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'\n", user_name, nsgrp->sg_name)); } @@ -336,6 +338,7 @@ if (is_shadow_grp) sgr_unlock (); #endif + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting user", user_name,user_id, 0); exit (code); } @@ -349,39 +352,47 @@ { if (!pw_lock ()) { fprintf (stderr, _("%s: unable to lock password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking password file", user_name,user_id, 1, 0); exit (E_PW_UPDATE); } if (!pw_open (O_RDWR)) { fprintf (stderr, _("%s: unable to open password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening password file", user_name,user_id, 0); fail_exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_lock ()) { fprintf (stderr, _("%s: cannot lock shadow password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking shadow password file", user_name,user_id, 0); fail_exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_open (O_RDWR)) { fprintf (stderr, _("%s: cannot open shadow password file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening shadow password file", user_name,user_id, 0); fail_exit (E_PW_UPDATE); } if (!gr_lock ()) { fprintf (stderr, _("%s: unable to lock group file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking group file", user_name,user_id, 0); fail_exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { fprintf (stderr, _("%s: cannot open group file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening group file", user_name,user_id, 0); fail_exit (E_GRP_UPDATE); } #ifdef SHADOWGRP if (is_shadow_grp && !sgr_lock ()) { fprintf (stderr, _("%s: unable to lock shadow group file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking shadow group file", user_name,user_id, 0); fail_exit (E_GRP_UPDATE); } if (is_shadow_grp && !sgr_open (O_RDWR)) { fprintf (stderr, _("%s: cannot open shadow group file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening shadow group file", user_name,user_id, 0); fail_exit (E_GRP_UPDATE); } #endif @@ -402,6 +413,7 @@ if (is_shadow_pwd && !spw_remove (user_name)) fprintf (stderr, _("%s: error deleting shadow password entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting user entries", user_name,user_id, 1); SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name)); } @@ -442,8 +454,10 @@ continue; fprintf (stderr, _("%s: user %s is currently logged in\n"), Prog, name); - if (!fflg) + if (!fflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting user logged in", name,-1, 0); exit (E_USER_BUSY); + } } } @@ -544,6 +558,7 @@ snprintf (mailfile, sizeof mailfile, "%s/%s", maildir, user_name); if (fflg) { unlink (mailfile); /* always remove, ignore errors */ + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting mail file", user_name,user_id, 1); return; } i = is_owner (user_id, mailfile); @@ -552,6 +567,7 @@ _ ("%s: %s not owned by %s, not removing\n"), Prog, mailfile, user_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting mail file", user_name,user_id, 0); return; } else if (i == -1) return; /* mailbox doesn't exist */ @@ -559,6 +575,9 @@ fprintf (stderr, _("%s: warning: can't remove "), Prog); perror (mailfile); } + else { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting mail file", user_name,user_id, 0); + } } #ifdef USE_PAM @@ -582,6 +601,9 @@ struct passwd *pampw; int retval; #endif + + audit_help_open(); + /* * Get my name so that I can use it to report errors. */ @@ -653,6 +675,7 @@ if (!(pwd = getpwnam (user_name))) { fprintf (stderr, _("%s: user %s does not exist\n"), Prog, user_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting user not found", user_name,-1, 0); exit (E_NOTFOUND); } #ifdef USE_NIS @@ -743,8 +766,10 @@ fprintf (stderr, _("%s: error removing directory %s\n"), Prog, user_home); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting home directory", user_name,user_id, 1); errors++; } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting home directory", user_name,user_id, 1); } /* @@ -769,6 +794,8 @@ if (retval == PAM_SUCCESS) pam_end (pamh, PAM_SUCCESS); #endif /* USE_PAM */ + if(errors) + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting home directory", user_name,-1, 0); exit (errors ? E_HOMEDIR : E_SUCCESS); /* NOT REACHED */ } --- shadow-4.0.12/src/Makefile.am.audit 2005-07-07 18:59:37.000000000 +0000 +++ shadow-4.0.12/src/Makefile.am 2005-09-01 13:04:03.000000000 +0000 @@ -51,28 +51,28 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" chpasswd_LDADD = $(LDADD) $(LIBPAM) -chage_LDADD = $(LDADD) $(LIBPAM) +chage_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) chfn_LDADD = $(LDADD) $(LIBPAM) chsh_SOURCES = \ chsh.c \ chsh_chkshell.c chsh_LDADD = $(LDADD) $(LIBPAM) -groupadd_LDADD = $(LDADD) $(LIBPAM) -groupdel_LDADD = $(LDADD) $(LIBPAM) -groupmod_LDADD = $(LDADD) $(LIBPAM) +groupadd_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) +groupdel_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) +groupmod_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) login_SOURCES = \ login.c \ login_nopam.c login_LDADD = $(LDADD) $(LIBPAM) newusers_LDADD = $(LDADD) $(LIBPAM) -passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) +passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(AUDIT) su_SOURCES = \ su.c \ suauth.c su_LDADD = $(LDADD) $(LIBPAM) -useradd_LDADD = $(LDADD) $(LIBPAM) -userdel_LDADD = $(LDADD) $(LIBPAM) -usermod_LDADD = $(LDADD) $(LIBPAM) +useradd_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) +userdel_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) +usermod_LDADD = $(LDADD) $(LIBPAM) $(AUDIT) install-am: all-am $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am --- shadow-4.0.12/src/chage.c.audit 2005-08-09 18:17:49.000000000 +0000 +++ shadow-4.0.12/src/chage.c 2005-09-01 13:28:39.000000000 +0000 @@ -366,6 +366,8 @@ int retval; #endif + audit_help_open(); + sanitize_env (); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -470,6 +472,7 @@ if (!amroot && !lflg) { fprintf (stderr, _("%s: Permission denied.\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", NULL,getuid(), 0); exit (E_NOPERM); } @@ -549,6 +552,7 @@ cleanup (1); SYSLOG ((LOG_ERR, "failed locking %s", SHADOW_FILE)); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", name,getuid(), 0); exit (E_NOPERM); } if (!spw_open (locks ? O_RDWR : O_RDONLY)) { @@ -557,12 +561,14 @@ cleanup (2); SYSLOG ((LOG_ERR, "failed opening %s", SHADOW_FILE)); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", name,getuid(), 0); exit (E_NOPERM); } if (lflg && (setgid (getgid ()) || setuid (ruid))) { fprintf (stderr, "%s: failed to drop privileges (%s)\n", Prog, strerror (errno)); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", name,getuid(), 0); exit (E_NOPERM); } @@ -588,6 +594,34 @@ inactdays = spwd.sp_inact; if (!Eflg) expdays = spwd.sp_expire; +#ifdef WITH_AUDIT + if (Mflg) + + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change max age", pw->pw_name,pw->pw_uid, 1); + if (mflg) + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change min age", pw->pw_name,pw->pw_uid, 1); + if (dflg) + { + char new_lastchg[200]; + char old_lastchg[200]; + date_to_str(new_lastchg, sizeof new_lastchg, lastday * DAY); + date_to_str(old_lastchg, sizeof old_lastchg, spwd.sp_lstchg * DAY); + + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change last change date", pw->pw_name,pw->pw_uid, 1); + } + if (Wflg) + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change passwd warning", pw->pw_name,pw->pw_uid, 1); + if (Iflg) + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change inactive days", pw->pw_name,pw->pw_uid, 1); + if (Eflg) + { + char new_exp[200]; + char old_exp[200]; + date_to_str(new_exp, sizeof new_exp, expdays * DAY); + date_to_str(old_exp, sizeof old_exp, spwd.sp_expire * DAY); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change passwd expiration", pw->pw_name,pw->pw_uid, 1); + } +#endif } /* @@ -597,10 +631,12 @@ if (lflg) { if (!amroot && (ruid != pwent.pw_uid)) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", pw->pw_name,pw->pw_uid, 0); fprintf (stderr, _("%s: Permission denied.\n"), Prog); closelog (); exit (E_NOPERM); } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"display aging info", pw->pw_name,pw->pw_uid, 1); list_fields (); cleanup (2); closelog (); @@ -619,8 +655,10 @@ Prog); cleanup (2); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", pw->pw_name,getuid(), 0); exit (E_NOPERM); - } + } else + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change all aging information", pw->pw_name,getuid(), 1); } /* * There was no shadow entry. The new entry will have the encrypted @@ -643,6 +681,7 @@ cleanup (2); SYSLOG ((LOG_ERR, "failed updating %s", PASSWD_FILE)); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", pw->pw_name,getuid(), 0); exit (E_NOPERM); } } @@ -666,6 +705,7 @@ cleanup (2); SYSLOG ((LOG_ERR, "failed updating %s", SHADOW_FILE)); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", pw->pw_name,getuid(), 0); exit (E_NOPERM); } @@ -679,6 +719,7 @@ cleanup (2); SYSLOG ((LOG_ERR, "failed rewriting %s", SHADOW_FILE)); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", pw->pw_name,getuid(), 0); exit (E_NOPERM); } #ifdef USE_PAM @@ -723,6 +764,7 @@ cleanup (2); SYSLOG ((LOG_ERR, "failed rewriting %s", PASSWD_FILE)); closelog (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"change age", pw->pw_name,getuid(), 0); exit (E_NOPERM); } cleanup (2); --- shadow-4.0.12/src/groupmod.c.audit 2005-09-01 13:04:03.000000000 +0000 +++ shadow-4.0.12/src/groupmod.c 2005-09-01 13:04:03.000000000 +0000 @@ -155,6 +155,7 @@ fprintf (stderr, _("%s: %s not found in /etc/group\n"), Prog, group_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group_name,-1,0); exit (E_GRP_UPDATE); } grp = *ogrp; @@ -172,10 +173,12 @@ if (!gr_update (&grp)) { fprintf (stderr, _("%s: error adding new group entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group", group_name,-1,0); exit (E_GRP_UPDATE); } if (nflg && !gr_remove (group_name)) { fprintf (stderr, _("%s: error removing group entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", group_name,-1,0); exit (E_GRP_UPDATE); } #ifdef SHADOWGRP @@ -194,15 +197,18 @@ if (!sgr_update (&sgrp)) { fprintf (stderr, _("%s: error adding new group entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group", group_name,-1,0); exit (E_GRP_UPDATE); } if (nflg && !sgr_remove (group_name)) { fprintf (stderr, _("%s: error removing group entry\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group", group_name,-1,0); exit (E_GRP_UPDATE); } out: #endif /* SHADOWGRP */ + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifing group", group_name, group_id,1); if (nflg) SYSLOG ((LOG_INFO, "change group `%s' to `%s'", group_name, group_newname)); @@ -239,6 +245,7 @@ */ fprintf (stderr, _("%s: %u is not a unique GID\n"), Prog, group_newid); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modify gid", NULL,group_newid,0); exit (E_GID_IN_USE); } @@ -270,6 +277,7 @@ fprintf (stderr, _("%s: %s is not a unique name\n"), Prog, group_newname); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group_name,-1,0); exit (E_NAME_IN_USE); } return; @@ -281,6 +289,7 @@ fprintf (stderr, _("%s: %s is not a valid group name\n"), Prog, group_newname); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group_name,-1,0); exit (E_BAD_ARG); } @@ -306,6 +315,7 @@ fprintf (stderr, _("%s: invalid group %s\n"), Prog, optarg); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", NULL,group_newid,0); exit (E_BAD_ARG); } break; @@ -415,6 +425,8 @@ int retval; #endif + audit_help_open(); + /* * Get my name so that I can use it to report errors. */ @@ -475,10 +487,19 @@ if (!(grp = getgrnam (group_name))) { fprintf (stderr, _("%s: group %s does not exist\n"), Prog, group_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group_name,-1,0); exit (E_NOTFOUND); } else group_id = grp->gr_gid; +#ifdef WITH_AUDIT + /* Set new name/id to original if not specified on command line */ + if (nflg == 0) + group_newname = group_name; + if (gflg == 0) + group_newid = group_id; +#endif + #ifdef USE_NIS /* * Now make sure it isn't an NIS group. @@ -490,6 +511,7 @@ fprintf (stderr, _("%s: group %s is a NIS group\n"), Prog, group_name); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group_name,-1,0); if (!yp_get_default_domain (&nis_domain) && !yp_master (nis_domain, "group.byname", &nis_master)) { fprintf (stderr, _("%s: %s is the NIS master\n"), --- shadow-4.0.12/src/usermod.c.audit 2005-09-01 13:04:03.000000000 +0000 +++ shadow-4.0.12/src/usermod.c 2005-09-01 13:04:03.000000000 +0000 @@ -84,12 +84,16 @@ static gid_t user_gid; static gid_t user_newgid; static char *user_comment; +static char *user_newcomment; /* Audit */ static char *user_home; static char *user_newhome; static char *user_shell; +static char *user_newshell; /* Audit */ static long user_expire; +static long user_newexpire; /* Audit */ static long user_inactive; +static long user_newinactive; /* Audit */ static long sys_ngroups; static char **user_groups; /* NULL-terminated list */ @@ -295,6 +299,7 @@ if (Lflg && pw_pass[0] != '!') { char *buf = xmalloc (strlen (pw_pass) + 2); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"updating passwd", user_newname,user_newid,0); SYSLOG ((LOG_INFO, "lock user `%s' password", pw_name)); strcpy (buf, "!"); strcat (buf, pw_pass); @@ -302,6 +307,7 @@ } else if (Uflg && pw_pass[0] == '!') { char *s; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"updating password", user_newname,user_newid,0); SYSLOG ((LOG_INFO, "unlock user `%s' password", pw_name)); s = pw_pass; while (*s) { @@ -309,6 +315,7 @@ s++; } } else if (pflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing password", user_newname,user_newid,1); SYSLOG ((LOG_INFO, "change user `%s' password", pw_name)); pw_pass = xstrdup (user_pass); } @@ -325,6 +332,7 @@ static void new_pwent (struct passwd *pwent) { if (lflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing name", user_newname,user_newid,1); SYSLOG ((LOG_INFO, "change user name `%s' to `%s'", pwent->pw_name, user_newname)); pwent->pw_name = xstrdup (user_newname); @@ -334,31 +342,48 @@ new_pw_passwd (pwent->pw_passwd, pwent->pw_name); if (uflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing uid", user_newname,user_newid,1); SYSLOG ((LOG_INFO, "change user `%s' UID from `%d' to `%d'", pwent->pw_name, pwent->pw_uid, user_newid)); pwent->pw_uid = user_newid; } if (gflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing primary group", user_newname,user_newid,1); SYSLOG ((LOG_INFO, "change user `%s' GID from `%d' to `%d'", pwent->pw_name, pwent->pw_gid, user_newgid)); pwent->pw_gid = user_newgid; } - if (cflg) + if (cflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing comment", user_newname,user_newid,1); +#ifdef WITH_AUDIT + pwent->pw_gecos = user_newcomment; +#else pwent->pw_gecos = user_comment; +#endif + } if (dflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing home directory", user_newname,user_newid,1); SYSLOG ((LOG_INFO, "change user `%s' home from `%s' to `%s'", pwent->pw_name, pwent->pw_dir, user_newhome)); pwent->pw_dir = user_newhome; } if (sflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing user shell", user_newname,user_newid,1); +#ifdef WITH_AUDIT + SYSLOG ((LOG_INFO, + "change user `%s' shell from `%s' to `%s'", + pwent->pw_name, pwent->pw_shell, user_newshell)); + pwent->pw_shell = user_newshell; +#else SYSLOG ((LOG_INFO, "change user `%s' shell from `%s' to `%s'", pwent->pw_name, pwent->pw_shell, user_shell)); pwent->pw_shell = user_shell; +#endif } } @@ -375,17 +400,69 @@ spent->sp_namp = xstrdup (user_newname); if (fflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing inactive days", user_newname,user_newid,1); +#ifdef WITH_AUDIT + SYSLOG ((LOG_INFO, + "change user `%s' inactive from `%ld' to `%ld'", + spent->sp_namp, spent->sp_inact, user_newinactive)); + spent->sp_inact = user_newinactive; +#else + SYSLOG ((LOG_INFO, "change user `%s' inactive from `%ld' to `%ld'", spent->sp_namp, spent->sp_inact, user_inactive)); spent->sp_inact = user_inactive; +#endif } if (eflg) { /* XXX - dates might be better than numbers of days. --marekm */ +#ifdef WITH_AUDIT + if(audit_fd >= 0) + { + time_t exp_t; + struct tm *exp_tm; + char new_exp[16], old_exp[16]; + + if (user_newexpire == -1) + new_exp[0] = '\0'; + else { + exp_t = user_newexpire * DAY; + exp_tm = gmtime(&exp_t); +#ifdef HAVE_STRFTIME + strftime(new_exp, sizeof(new_exp), "%Y-%m-%d", exp_tm); +#else + memset(new_exp, 0, sizeof(new_exp)); + snprintf(new_exp, sizeof(new_exp)-1, "%04i-%02i-%02i", + exp_tm->tm_year + 1900, exp_tm->tm_mon + 1, exp_tm->tm_mday); +#endif + } + + if (user_expire == -1) + old_exp[0] = '\0'; + else { + exp_t = user_expire * DAY; + exp_tm = gmtime(&exp_t); +#ifdef HAVE_STRFTIME + strftime(old_exp, sizeof(old_exp), "%Y-%m-%d", exp_tm); +#else + memset(old_exp, 0, sizeof(old_exp)); + snprintf(old_exp, sizeof(old_exp)-1, "%04i-%02i-%02i", + exp_tm->tm_year + 1900, exp_tm->tm_mon + 1, exp_tm->tm_mday); +#endif + } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing expiration date", user_newname,user_newid,1); + } + + SYSLOG ((LOG_INFO, + "change user `%s' expiration from `%ld' to `%ld'", + spent->sp_namp, spent->sp_expire, user_newexpire)); + spent->sp_expire = user_newexpire; +#else SYSLOG ((LOG_INFO, "change user `%s' expiration from `%ld' to `%ld'", spent->sp_namp, spent->sp_expire, user_expire)); spent->sp_expire = user_expire; +#endif } spent->sp_pwdp = new_pw_passwd (spent->sp_pwdp, spent->sp_namp); if (pflg) @@ -406,6 +483,7 @@ if (is_shadow_pwd) spw_unlock (); (void) pw_unlock (); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying account", user_name,-1,0); exit (code); } @@ -468,6 +546,7 @@ ngrp->gr_mem = add_list (ngrp->gr_mem, user_newname); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing group member", user_newname,-1,1); SYSLOG ((LOG_INFO, "change `%s' to `%s' in group `%s'", user_name, user_newname, @@ -476,6 +555,7 @@ } else if (was_member && !aflg && Gflg && !is_member) { ngrp->gr_mem = del_list (ngrp->gr_mem, user_name); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"removing group member", user_name,-1,1); SYSLOG ((LOG_INFO, "delete `%s' from group `%s'", user_name, ngrp->gr_name)); } else if (!was_member && Gflg && is_member) { @@ -483,6 +563,7 @@ lflg ? user_newname : user_name); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user to group", user_name,-1,1); SYSLOG ((LOG_INFO, "add `%s' to group `%s'", lflg ? user_newname : user_name, ngrp->gr_name)); @@ -574,6 +655,7 @@ nsgrp->sg_adm = del_list (nsgrp->sg_adm, user_name); nsgrp->sg_adm = add_list (nsgrp->sg_adm, user_newname); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing admin name in shadow group", user_name,-1, 1); SYSLOG ((LOG_INFO, "change admin `%s' to `%s' in shadow group `%s'", user_name, user_newname, nsgrp->sg_name)); @@ -585,6 +667,7 @@ nsgrp->sg_mem = add_list (nsgrp->sg_mem, user_newname); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing member in shadow group", user_name,-1, 1); SYSLOG ((LOG_INFO, "change `%s' to `%s' in shadow group `%s'", user_name, user_newname, @@ -593,6 +676,7 @@ } else if (was_member && !aflg && Gflg && !is_member) { nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"removing user from shadow group", user_name,-1, 1); SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'", user_name, nsgrp->sg_name)); @@ -601,6 +685,7 @@ lflg ? user_newname : user_name); changed = 1; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding user to shadow group", user_newname,-1, 1); SYSLOG ((LOG_INFO, "add `%s' to shadow group `%s'", lflg ? user_newname : user_name, nsgrp->sg_name)); @@ -704,6 +789,9 @@ exit (E_NOTFOUND); } user_name = argv[argc - 1]; +#ifdef WITH_AUDIT + user_newname = user_name; +#endif #ifdef USE_NIS @@ -727,14 +815,35 @@ } #endif user_id = pwd->pw_uid; +#ifdef WITH_AUDIT + user_newid = user_id; +#endif user_gid = pwd->pw_gid; +#ifdef WITH_AUDIT + user_newgid = user_gid; +#endif user_comment = xstrdup (pwd->pw_gecos); +#ifdef WITH_AUDIT + user_newcomment = user_comment; +#endif user_home = xstrdup (pwd->pw_dir); +#ifdef WITH_AUDIT + user_newhome = user_home; +#endif user_shell = xstrdup (pwd->pw_shell); +#ifdef WITH_AUDIT + user_newshell = user_shell; +#endif if (is_shadow_pwd && (spwd = getspnam (user_name))) { user_expire = spwd->sp_expire; +#ifdef WITH_AUDIT + user_newexpire = user_expire; +#endif user_inactive = spwd->sp_inact; +#ifdef WITH_AUDIT + user_newinactive = user_inactive; +#endif } while ((arg = getopt (argc, argv, "ac:d:e:f:g:G:l:Lmop:s:u:U")) != EOF) { @@ -749,7 +858,12 @@ Prog, optarg); exit (E_BAD_ARG); } +#ifdef WITH_AUDIT + user_newcomment = optarg; +#else + user_comment = optarg; +#endif cflg++; break; case 'd': @@ -764,21 +878,40 @@ break; case 'e': if (*optarg) { +#ifdef WITH_AUDIT + user_newexpire = strtoday (optarg); + if (user_newexpire == -1) { +#else user_expire = strtoday (optarg); if (user_expire == -1) { +#endif fprintf (stderr, _ ("%s: invalid date `%s'\n"), Prog, optarg); exit (E_BAD_ARG); } +#ifdef WITH_AUDIT + user_newexpire *= DAY / SCALE; +#else + user_expire *= DAY / SCALE; +#endif } else +#ifdef WITH_AUDIT + user_newexpire = -1; +#else + user_expire = -1; +#endif eflg++; break; case 'f': +#ifdef WITH_AUDIT + user_newinactive = get_number (optarg); +#else user_inactive = get_number (optarg); +#endif fflg++; break; case 'g': @@ -848,7 +981,11 @@ Prog, optarg); exit (E_BAD_ARG); } +#ifdef WITH_AUDIT + user_newshell = optarg; +#else user_shell = optarg; +#endif sflg++; break; case 'u': @@ -1088,6 +1225,10 @@ _ ("%s: warning: failed to completely remove old home directory %s"), Prog, user_home); + audit_logger(AUDIT_USER_CHAUTHTOK, + Prog, + "moving home directory", + user_newname,user_newid, 1); return; } @@ -1100,11 +1241,14 @@ Prog, user_home, user_newhome); fail_exit (E_HOMEDIR); } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"moving home directory", user_newname,user_newid, 1); } - if (uflg || gflg) + if (uflg || gflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing home directory owner", user_newname,user_newid, 1); chown (dflg ? user_newhome : user_home, uflg ? user_newid : user_id, gflg ? user_newgid : user_gid); + } } /* @@ -1196,16 +1340,26 @@ close (fd); return; } - if (uflg && fchown (fd, user_newid, (gid_t) - 1) < 0) - perror (_("failed to change mailbox owner")); + if (uflg) { + if (fchown (fd, user_newid, (gid_t) - 1) < 0) { + perror (_("failed to change mailbox owner")); + } + else { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing mail file owner", user_newname,user_newid, 1); + } + } close (fd); if (lflg) { snprintf (newmailfile, sizeof newmailfile, "%s/%s", maildir, user_newname); - if (link (mailfile, newmailfile) || unlink (mailfile)) + if (link (mailfile, newmailfile) || unlink (mailfile)) { perror (_("failed to rename mailbox")); + } + else { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing mail file name", user_newname,user_newid, 1); + } } } #endif @@ -1232,6 +1386,8 @@ int retval; #endif + audit_help_open(); + /* * Get my name so that I can use it to report errors. */ --- shadow-4.0.12/src/gpasswd.c.audit 2005-08-09 16:40:07.000000000 +0000 +++ shadow-4.0.12/src/gpasswd.c 2005-09-01 13:04:03.000000000 +0000 @@ -55,6 +55,8 @@ static int aflg = 0, Aflg = 0, dflg = 0, Mflg = 0, rflg = 0, Rflg = 0; +unsigned int bywho = -1; + #ifndef RETRIES #define RETRIES 3 #endif @@ -186,6 +188,8 @@ char *group = NULL; char *members = NULL; + audit_help_open(); + sanitize_env (); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -200,6 +204,7 @@ */ amroot = getuid () == 0; + bywho = getuid(); Prog = Basename (argv[0]); OPENLOG ("gpasswd"); @@ -217,14 +222,17 @@ fprintf (stderr, _("%s: unknown user %s\n"), Prog, user); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding to group", user,-1, 0); exit (1); } aflg++; break; #ifdef SHADOWGRP case 'A': - if (!amroot) + if (!amroot) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"Listing administrators", NULL,bywho, 0); failure (); + } if (!is_shadowgrp) { fprintf (stderr, _ @@ -245,8 +253,10 @@ case 'g': /* no-op from normal password */ break; case 'M': - if (!amroot) + if (!amroot) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"listing members", NULL,bywho, 0); failure (); + } members = optarg; if (check_list (members)) exit (1); @@ -280,6 +290,8 @@ pw = get_my_pwent (); if (!pw) { fprintf (stderr, _("Who are you?\n")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"user lookup", NULL, bywho, 0); + failure(); exit (1); } myname = xstrdup (pw->pw_name); @@ -299,6 +311,8 @@ if (!(gr = getgrnam (group))) { fprintf (stderr, _("unknown group: %s\n"), group); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"group lookup", group,-1, 0); + failure(); exit (1); } grent = *gr; @@ -340,8 +354,10 @@ * user can. */ - if (!amroot && !is_on_list (sgent.sg_adm, myname)) + if (!amroot && !is_on_list (sgent.sg_adm, myname)) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modify group", group,-1, 0); failure (); + } #else /* ! SHADOWGRP */ #ifdef FIRST_MEMBER_IS_ADMIN @@ -354,11 +370,15 @@ */ if (!amroot) { - if (grent.gr_mem[0] == (char *) 0) + if (grent.gr_mem[0] == (char *) 0) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group,-1, 0); failure (); + } - if (strcmp (grent.gr_mem[0], myname) != 0) + if (strcmp (grent.gr_mem[0], myname) != 0) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", myname,-1, 0); failure (); + } } #else /* @@ -367,8 +387,10 @@ * be just a normal user. --marekm */ - if (!amroot) + if (!amroot) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"modifying group", group,-1, 0); failure (); + } #endif #endif /* SHADOWGRP */ @@ -383,6 +405,7 @@ #ifdef SHADOWGRP sgent.sg_passwd = ""; /* XXX warning: const */ #endif + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting group password", group,-1, 1); SYSLOG ((LOG_INFO, "remove password from group %s by %s", group, myname)); goto output; @@ -396,6 +419,7 @@ #ifdef SHADOWGRP sgent.sg_passwd = "!"; /* XXX warning: const */ #endif + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"restrict access to group", group,-1, 1); SYSLOG ((LOG_INFO, "restrict access to group %s by %s", group, myname)); goto output; @@ -412,6 +436,7 @@ #ifdef SHADOWGRP sgent.sg_mem = add_list (sgent.sg_mem, user); #endif + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"adding group member", user,-1, 1); SYSLOG ((LOG_INFO, "add member %s to group %s by %s", user, group, myname)); goto output; @@ -440,8 +465,10 @@ if (!removed) { fprintf (stderr, _("%s: unknown member %s\n"), Prog, user); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting member", user,-1, 0); exit (1); } + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"deleting member", user,-1, 1); SYSLOG ((LOG_INFO, "remove member %s from group %s by %s", user, group, myname)); goto output; @@ -454,6 +481,7 @@ */ if (Aflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"setting group admin", group,-1, 1); SYSLOG ((LOG_INFO, "set administrators of %s to %s", group, admins)); sgent.sg_adm = comma_to_list (admins); @@ -469,6 +497,7 @@ */ if (Mflg) { + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"setting group members", group,-1, 1); SYSLOG ((LOG_INFO, "set members of %s to %s", group, members)); #ifdef SHADOWGRP sgent.sg_mem = comma_to_list (members); @@ -485,6 +514,7 @@ if (!isatty (0) || !isatty (1)) { fprintf (stderr, _("%s: Not a tty\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing password", group,-1, 0); exit (1); } @@ -524,8 +554,10 @@ strzero (cp); memzero (pass, sizeof pass); - if (retries + 1 < RETRIES) + if (retries + 1 < RETRIES) { puts (_("They don't match; try again")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing password", group,-1, 0); + } } if (retries == RETRIES) { @@ -541,6 +573,7 @@ else #endif grent.gr_passwd = cp; + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing password", group,-1, 1); SYSLOG ((LOG_INFO, "change the password for group %s by %s", group, myname)); @@ -555,6 +588,7 @@ if (setuid (0)) { fprintf (stderr, _("Cannot change ID to root.\n")); SYSLOG ((LOG_ERR, "can't setuid(0)")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"changing id to root", group,-1, 0); closelog (); exit (1); } @@ -563,48 +597,56 @@ if (!gr_lock ()) { fprintf (stderr, _("%s: can't get lock\n"), Prog); SYSLOG ((LOG_WARN, "failed to get lock for /etc/group")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking /etc/group", group,-1, 0); exit (1); } #ifdef SHADOWGRP if (is_shadowgrp && !sgr_lock ()) { fprintf (stderr, _("%s: can't get shadow lock\n"), Prog); SYSLOG ((LOG_WARN, "failed to get lock for /etc/gshadow")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"locking /etc/gshadow", group,-1, 0); exit (1); } #endif if (!gr_open (O_RDWR)) { fprintf (stderr, _("%s: can't open file\n"), Prog); SYSLOG ((LOG_WARN, "cannot open /etc/group")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening /etc/group", group,-1, 0); exit (1); } #ifdef SHADOWGRP if (is_shadowgrp && !sgr_open (O_RDWR)) { fprintf (stderr, _("%s: can't open shadow file\n"), Prog); SYSLOG ((LOG_WARN, "cannot open /etc/gshadow")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"opening /etc/gshadow", group,-1, 0); exit (1); } #endif if (!gr_update (&grent)) { fprintf (stderr, _("%s: can't update entry\n"), Prog); SYSLOG ((LOG_WARN, "cannot update /etc/group")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"updating /etc/group", group,-1, 0); exit (1); } #ifdef SHADOWGRP if (is_shadowgrp && !sgr_update (&sgent)) { fprintf (stderr, _("%s: can't update shadow entry\n"), Prog); SYSLOG ((LOG_WARN, "cannot update /etc/gshadow")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"updating /etc/gshadow", group,-1, 0); exit (1); } #endif if (!gr_close ()) { fprintf (stderr, _("%s: can't re-write file\n"), Prog); SYSLOG ((LOG_WARN, "cannot re-write /etc/group")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"rewriting /etc/group", group,-1, 0); exit (1); } #ifdef SHADOWGRP if (is_shadowgrp && !sgr_close ()) { fprintf (stderr, _("%s: can't re-write shadow file\n"), Prog); SYSLOG ((LOG_WARN, "cannot re-write /etc/gshadow")); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"rewriting /etc/gshadow", group,-1, 0); exit (1); } if (is_shadowgrp) @@ -612,6 +654,7 @@ #endif if (!gr_unlock ()) { fprintf (stderr, _("%s: can't unlock file\n"), Prog); + audit_logger(AUDIT_USER_CHAUTHTOK,Prog,"unlocking group file", group,-1, 0); exit (1); } --- shadow-4.0.12/config.h.in.audit 2005-08-11 16:31:43.000000000 +0000 +++ shadow-4.0.12/config.h.in 2005-09-01 13:04:03.000000000 +0000 @@ -93,6 +93,9 @@ /* Defined if you have libcrack. */ #undef HAVE_LIBCRACK +/* Defined if you have libaudit */ +#undef WITH_AUDIT + /* Defined if you have the ts&szs cracklib. */ #undef HAVE_LIBCRACK_HIST Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- shadow-utils.spec 27 Aug 2005 15:35:09 -0000 1.56 +++ shadow-utils.spec 1 Sep 2005 11:46:33 -0000 1.57 @@ -7,7 +7,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.12 -Release: 1 +Release: 2 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -20,12 +20,15 @@ Patch4: shadow-4.0.11.1-newgrpPwd.patch Patch5: shadow-4.0.11.1-isSelinuxEnabled.patch Patch6: shadow-4.0.11.1-selinux.patch +Patch7: shadow-4.0.12-audit.patch License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel BuildRequires: libselinux-devel >= 1.25.2-1 +BuildRequires: audit-libs-devel >= 0.9.8 Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: libselinux >= 1.25.2-1 +Requires: audit-libs >= 0.9.8 Obsoletes: adduser %description @@ -49,6 +52,7 @@ %patch4 -p1 -b .newgrpPwd %patch5 -p1 -b .isSelinuxEnabled %patch6 -p1 -b .selinux +%patch7 -p1 -b .audit rm po/*.gmo rm po/stamp-po @@ -229,6 +233,9 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Tue Aug 30 2005 Peter Vrabec 2:4.0.12-2 +- audit support + * Sat Aug 27 2005 Peter Vrabec 2:4.0.12-1 - upgrade From fedora-cvs-commits at redhat.com Thu Sep 1 12:34:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 08:34:29 -0400 Subject: rpms/vim/devel vim.spec,1.77,1.78 Message-ID: <200509011234.j81CYT2Y014045@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14013 Modified Files: vim.spec Log Message: add patch from Matthias Saou to move vim-X11 to /usr/bin Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- vim.spec 16 Aug 2005 09:03:07 -0000 1.77 +++ vim.spec 1 Sep 2005 12:34:26 -0000 1.78 @@ -26,7 +26,7 @@ Summary: The VIM editor. Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2 +Release: 3 License: freeware Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2 @@ -50,93 +50,93 @@ Patch2010: xxd-locale.patch # Patches 001 < 999 are patches from the base maintainer. # If you're as lazy as me, generate the list using -# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.2.%03d\n" $i $i; done -Patch001: ftp://ftp.vim.org/pub/vim/patches/6.3.001 -Patch002: ftp://ftp.vim.org/pub/vim/patches/6.3.002 -Patch003: ftp://ftp.vim.org/pub/vim/patches/6.3.003 -Patch004: ftp://ftp.vim.org/pub/vim/patches/6.3.004 -Patch005: ftp://ftp.vim.org/pub/vim/patches/6.3.005 -Patch006: ftp://ftp.vim.org/pub/vim/patches/6.3.006 -Patch007: ftp://ftp.vim.org/pub/vim/patches/6.3.007 -Patch008: ftp://ftp.vim.org/pub/vim/patches/6.3.008 -Patch009: ftp://ftp.vim.org/pub/vim/patches/6.3.009 -Patch010: ftp://ftp.vim.org/pub/vim/patches/6.3.010 -Patch011: ftp://ftp.vim.org/pub/vim/patches/6.3.011 -Patch012: ftp://ftp.vim.org/pub/vim/patches/6.3.012 -Patch013: ftp://ftp.vim.org/pub/vim/patches/6.3.013 -Patch014: ftp://ftp.vim.org/pub/vim/patches/6.3.014 -Patch015: ftp://ftp.vim.org/pub/vim/patches/6.3.015 -Patch016: ftp://ftp.vim.org/pub/vim/patches/6.3.016 -Patch017: ftp://ftp.vim.org/pub/vim/patches/6.3.017 -Patch018: ftp://ftp.vim.org/pub/vim/patches/6.3.018 -Patch019: ftp://ftp.vim.org/pub/vim/patches/6.3.019 -Patch020: ftp://ftp.vim.org/pub/vim/patches/6.3.020 -Patch021: ftp://ftp.vim.org/pub/vim/patches/6.3.021 -Patch022: ftp://ftp.vim.org/pub/vim/patches/6.3.022 -Patch023: ftp://ftp.vim.org/pub/vim/patches/6.3.023 -Patch024: ftp://ftp.vim.org/pub/vim/patches/6.3.024 -Patch025: ftp://ftp.vim.org/pub/vim/patches/6.3.025 -Patch026: ftp://ftp.vim.org/pub/vim/patches/6.3.026 -Patch027: ftp://ftp.vim.org/pub/vim/patches/6.3.027 -Patch028: ftp://ftp.vim.org/pub/vim/patches/6.3.028 -Patch029: ftp://ftp.vim.org/pub/vim/patches/6.3.029 -Patch030: ftp://ftp.vim.org/pub/vim/patches/6.3.030 -Patch031: ftp://ftp.vim.org/pub/vim/patches/6.3.031 -Patch032: ftp://ftp.vim.org/pub/vim/patches/6.3.032 -Patch033: ftp://ftp.vim.org/pub/vim/patches/6.3.033 -Patch034: ftp://ftp.vim.org/pub/vim/patches/6.3.034 -Patch035: ftp://ftp.vim.org/pub/vim/patches/6.3.035 -Patch036: ftp://ftp.vim.org/pub/vim/patches/6.3.036 -Patch037: ftp://ftp.vim.org/pub/vim/patches/6.3.037 -Patch038: ftp://ftp.vim.org/pub/vim/patches/6.3.038 -Patch039: ftp://ftp.vim.org/pub/vim/patches/6.3.039 -Patch040: ftp://ftp.vim.org/pub/vim/patches/6.3.040 -Patch041: ftp://ftp.vim.org/pub/vim/patches/6.3.041 -Patch042: ftp://ftp.vim.org/pub/vim/patches/6.3.042 -Patch043: ftp://ftp.vim.org/pub/vim/patches/6.3.043 -Patch044: ftp://ftp.vim.org/pub/vim/patches/6.3.044 -Patch045: ftp://ftp.vim.org/pub/vim/patches/6.3.045 -Patch046: ftp://ftp.vim.org/pub/vim/patches/6.3.046 -Patch047: ftp://ftp.vim.org/pub/vim/patches/6.3.047 -Patch048: ftp://ftp.vim.org/pub/vim/patches/6.3.048 -Patch049: ftp://ftp.vim.org/pub/vim/patches/6.3.049 -Patch050: ftp://ftp.vim.org/pub/vim/patches/6.3.050 -Patch051: ftp://ftp.vim.org/pub/vim/patches/6.3.051 -Patch052: ftp://ftp.vim.org/pub/vim/patches/6.3.052 -Patch053: ftp://ftp.vim.org/pub/vim/patches/6.3.053 -Patch054: ftp://ftp.vim.org/pub/vim/patches/6.3.054 -Patch055: ftp://ftp.vim.org/pub/vim/patches/6.3.055 -Patch056: ftp://ftp.vim.org/pub/vim/patches/6.3.056 -Patch057: ftp://ftp.vim.org/pub/vim/patches/6.3.057 -Patch058: ftp://ftp.vim.org/pub/vim/patches/6.3.058 -Patch059: ftp://ftp.vim.org/pub/vim/patches/6.3.059 -Patch060: ftp://ftp.vim.org/pub/vim/patches/6.3.060 -Patch061: ftp://ftp.vim.org/pub/vim/patches/6.3.061 -Patch062: ftp://ftp.vim.org/pub/vim/patches/6.3.062 -Patch063: ftp://ftp.vim.org/pub/vim/patches/6.3.063 -Patch064: ftp://ftp.vim.org/pub/vim/patches/6.3.064 -Patch065: ftp://ftp.vim.org/pub/vim/patches/6.3.065 -Patch066: ftp://ftp.vim.org/pub/vim/patches/6.3.066 -Patch067: ftp://ftp.vim.org/pub/vim/patches/6.3.067 -Patch068: ftp://ftp.vim.org/pub/vim/patches/6.3.068 -Patch069: ftp://ftp.vim.org/pub/vim/patches/6.3.069 -Patch070: ftp://ftp.vim.org/pub/vim/patches/6.3.070 -Patch071: ftp://ftp.vim.org/pub/vim/patches/6.3.071 -Patch072: ftp://ftp.vim.org/pub/vim/patches/6.3.072 -Patch073: ftp://ftp.vim.org/pub/vim/patches/6.3.073 -Patch074: ftp://ftp.vim.org/pub/vim/patches/6.3.074 -Patch075: ftp://ftp.vim.org/pub/vim/patches/6.3.075 -Patch076: ftp://ftp.vim.org/pub/vim/patches/6.3.076 -Patch077: ftp://ftp.vim.org/pub/vim/patches/6.3.077 -Patch078: ftp://ftp.vim.org/pub/vim/patches/6.3.078 -Patch079: ftp://ftp.vim.org/pub/vim/patches/6.3.079 -Patch080: ftp://ftp.vim.org/pub/vim/patches/6.3.080 -Patch081: ftp://ftp.vim.org/pub/vim/patches/6.3.081 -Patch082: ftp://ftp.vim.org/pub/vim/patches/6.3.082 -Patch083: ftp://ftp.vim.org/pub/vim/patches/6.3.083 -Patch084: ftp://ftp.vim.org/pub/vim/patches/6.3.084 -Patch085: ftp://ftp.vim.org/pub/vim/patches/6.3.085 -Patch086: ftp://ftp.vim.org/pub/vim/patches/6.3.086 +# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.%03d\n" $i $i; done +Patch001: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.001 +Patch002: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.002 +Patch003: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.003 +Patch004: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.004 +Patch005: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.005 +Patch006: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.006 +Patch007: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.007 +Patch008: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.008 +Patch009: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.009 +Patch010: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.010 +Patch011: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.011 +Patch012: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.012 +Patch013: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.013 +Patch014: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.014 +Patch015: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.015 +Patch016: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.016 +Patch017: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.017 +Patch018: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.018 +Patch019: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.019 +Patch020: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.020 +Patch021: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.021 +Patch022: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.022 +Patch023: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.023 +Patch024: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.024 +Patch025: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.025 +Patch026: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.026 +Patch027: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.027 +Patch028: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.028 +Patch029: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.029 +Patch030: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.030 +Patch031: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.031 +Patch032: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.032 +Patch033: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.033 +Patch034: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.034 +Patch035: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.035 +Patch036: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.036 +Patch037: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.037 +Patch038: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.038 +Patch039: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.039 +Patch040: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.040 +Patch041: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.041 +Patch042: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.042 +Patch043: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.043 +Patch044: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.044 +Patch045: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.045 +Patch046: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.046 +Patch047: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.047 +Patch048: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.048 +Patch049: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.049 +Patch050: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.050 +Patch051: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.051 +Patch052: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.052 +Patch053: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.053 +Patch054: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.054 +Patch055: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.055 +Patch056: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.056 +Patch057: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.057 +Patch058: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.058 +Patch059: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.059 +Patch060: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.060 +Patch061: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.061 +Patch062: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.062 +Patch063: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.063 +Patch064: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.064 +Patch065: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.065 +Patch066: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.066 +Patch067: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.067 +Patch068: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.068 +Patch069: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.069 +Patch070: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.070 +Patch071: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.071 +Patch072: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.072 +Patch073: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.073 +Patch074: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.074 +Patch075: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.075 +Patch076: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.076 +Patch077: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.077 +Patch078: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.078 +Patch079: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.079 +Patch080: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.080 +Patch081: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.081 +Patch082: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.082 +Patch083: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.083 +Patch084: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.084 +Patch085: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.085 +Patch086: ftp://ftp.vim.org/pub/vim/patches/6.3/6.3.086 Patch3000: vim-6.1-syntax.patch Patch3001: vim-6.2-rh1.patch @@ -386,7 +386,7 @@ %if "%{withgui}" == "1" %configure --with-features=huge --enable-pythoninterp --enable-perlinterp \ - --disable-tclinterp --with-x=yes --exec-prefix=/usr/X11R6 \ + --disable-tclinterp --with-x=yes \ --enable-xim --enable-multibyte \ --enable-gtk2-check --enable-gui=gtk2 \ --with-compiledby="" --enable-cscope \ @@ -434,7 +434,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/bin -mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim,X11R6/bin} +mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim} cp -f %{SOURCE5} . cd src @@ -443,7 +443,7 @@ make installmacros DESTDIR=$RPM_BUILD_ROOT %if "%{withgui}" == "1" mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps -install -m755 gvim $RPM_BUILD_ROOT/usr/X11R6/bin +install -m755 gvim $RPM_BUILD_ROOT/usr/bin install -m644 %{SOURCE7} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png install -m644 %{SOURCE8} \ @@ -473,13 +473,13 @@ ln -sf vim.1.gz .%{_mandir}/man1/rvim.1.gz ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz %if "%{withgui}" == "1" - ln -sf gvim ./usr/X11R6/bin/gview - ln -sf gvim ./usr/X11R6/bin/gex - ln -sf gvim ./usr/X11R6/bin/evim - ln -sf gvim ./usr/X11R6/bin/gvimdiff + ln -sf gvim ./usr/bin/gview + ln -sf gvim ./usr/bin/gex + ln -sf gvim ./usr/bin/evim + ln -sf gvim ./usr/bin/gvimdiff ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz ln -sf vim.1.gz .%{_mandir}/man1/gvimdiff.1.gz - ln -sf gvim ./usr/X11R6/bin/vimx + ln -sf gvim ./usr/bin/vimx %if "%{desktop_file}" == "1" mkdir -p $RPM_BUILD_ROOT/usr/share/applications desktop-file-install --vendor net \ @@ -626,18 +626,22 @@ %else /etc/X11/applnk/*/gvim.desktop %endif -/usr/X11R6/bin/gvim -/usr/X11R6/bin/gvimdiff -/usr/X11R6/bin/gview -/usr/X11R6/bin/gex -/usr/X11R6/bin/vimx -/usr/X11R6/bin/evim +/usr/bin/gvim +/usr/bin/gvimdiff +/usr/bin/gview +/usr/bin/gex +/usr/bin/vimx +/usr/bin/evim %{_mandir}/man1/evim.* %{_mandir}/man1/gvim* %{_datadir}/icons/hicolor/*/apps/* %endif %changelog +* Thu Sep 01 2005 Karsten Hopp 6.3.086-3 +- move X11 stuff to /usr/bin per request of xorg.x11 maintainer + Matthias Saou (#167176) + * Tue Aug 16 2005 Karsten Hopp 6.3.086-2 - rebuild From fedora-cvs-commits at redhat.com Thu Sep 1 13:09:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 09:09:11 -0400 Subject: rpms/prelink/devel .cvsignore, 1.24, 1.25 prelink.spec, 1.28, 1.29 sources, 1.24, 1.25 Message-ID: <200509011309.j81D9BeU002400@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/prelink/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2330 Modified Files: .cvsignore prelink.spec sources Log Message: 0.3.6-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/prelink/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 29 Jul 2005 14:17:20 -0000 1.24 +++ .cvsignore 1 Sep 2005 13:09:08 -0000 1.25 @@ -1 +1 @@ -prelink-20050729.tar.bz2 +prelink-20050901.tar.bz2 Index: prelink.spec =================================================================== RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- prelink.spec 29 Jul 2005 14:17:20 -0000 1.28 +++ prelink.spec 1 Sep 2005 13:09:08 -0000 1.29 @@ -1,10 +1,10 @@ Summary: An ELF prelinking utility Name: prelink -Version: 0.3.5 -Release: 2 +Version: 0.3.6 +Release: 1 License: GPL Group: System Environment/Base -%define date 20050729 +%define date 20050901 Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2 Source2: prelink.conf Source3: prelink.cron @@ -13,7 +13,7 @@ #BuildRequires: libelf-devel >= 0.7.0-5 BuildRequires: elfutils-devel >= 0.72 BuildRequires: libselinux-devel -Requires: glibc >= 2.2.4-18, kernel >= 2.4.10, coreutils, findutils +Requires: glibc >= 2.2.4-18, coreutils, findutils Requires: util-linux, gawk, grep # For now ExclusiveArch: %{ix86} alpha sparc sparc64 s390 s390x x86_64 ppc ppc64 @@ -89,6 +89,12 @@ %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink.log %changelog +* Thu Sep 1 2005 Jakub Jelinek 0.3.6-1 +- remove kernel requires - installed kernel doesn't imply running + kernel anyway and in FC5 kernels older than 2.4.20 can't be used + anyway, as LinuxThreads are no longer included +- don't relocate stabs N_{B,D,}SLINE (reported by Ashley Pittman) + * Fri Jul 29 2005 Jakub Jelinek 0.3.5-2 - on ppc32 handle -mbss-plt .got sections created with -msecure-plt capable binutils (#164615) Index: sources =================================================================== RCS file: /cvs/dist/rpms/prelink/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 29 Jul 2005 14:17:20 -0000 1.24 +++ sources 1 Sep 2005 13:09:08 -0000 1.25 @@ -1 +1 @@ -a97c257e4fe4699ffa4fb00853baaeae prelink-20050729.tar.bz2 +9d1f6617a90e797f6c21f238afe97eba prelink-20050901.tar.bz2 From fedora-cvs-commits at redhat.com Thu Sep 1 13:12:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 09:12:05 -0400 Subject: rpms/busybox/devel .cvsignore, 1.8, 1.9 busybox.spec, 1.26, 1.27 sources, 1.8, 1.9 busybox-1.00-declar.patch, 1.1, NONE Message-ID: <200509011312.j81DC5Nr003830@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/busybox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3605 Modified Files: .cvsignore busybox.spec sources Removed Files: busybox-1.00-declar.patch Log Message: - new upstream version (1.01) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/busybox/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Jan 2005 13:07:43 -0000 1.8 +++ .cvsignore 1 Sep 2005 13:12:02 -0000 1.9 @@ -1 +1 @@ -busybox-1.00.tar.bz2 +busybox-1.01.tar.bz2 Index: busybox.spec =================================================================== RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- busybox.spec 11 May 2005 07:55:17 -0000 1.26 +++ busybox.spec 1 Sep 2005 13:12:02 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox -Version: 1.00 -Release: 5 +Version: 1.01 +Release: 1 Epoch: 1 License: GPL Group: System Environment/Shells @@ -9,7 +9,6 @@ Patch: busybox-static.patch Patch1: busybox-anaconda.patch Patch2: busybox-selinux.patch -Patch3: busybox-1.00-declar.patch URL: http://www.busybox.net BuildRoot: %{_tmppath}/%{name}-root BuildRequires: libselinux-devel @@ -38,7 +37,6 @@ %patch2 -b .selinux -p1 %patch -b .static -p1 #%patch1 -b .anaconda -p1 -%patch3 -b .declar -p1 %build make defconfig @@ -76,6 +74,9 @@ /sbin/busybox.anaconda %changelog +* Thu Sep 1 2005 Ivana Varekova - 1.01-1 +- update to 1.01 + * Tue May 11 2005 Ivana Varekova - 1.00-5 - add debug files to debug_package Index: sources =================================================================== RCS file: /cvs/dist/rpms/busybox/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Jan 2005 13:07:43 -0000 1.8 +++ sources 1 Sep 2005 13:12:02 -0000 1.9 @@ -1 +1 @@ -5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 +f250842dae2854a38470ed16a46bba66 busybox-1.01.tar.bz2 --- busybox-1.00-declar.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Sep 1 13:53:01 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 09:53:01 -0400 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.436, 1.437 sources, 1.110, 1.111 Message-ID: <200509011353.j81Dr1SE022248@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22235 Modified Files: openoffice.org.spec sources Log Message: boost fucked Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.436 retrieving revision 1.437 diff -u -r1.436 -r1.437 --- openoffice.org.spec 1 Sep 2005 10:50:42 -0000 1.436 +++ openoffice.org.spec 1 Sep 2005 13:52:59 -0000 1.437 @@ -866,7 +866,9 @@ fi cd config_office autoconf -%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang} +# system boost fucked +#%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang} +%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang} cd .. ./bootstrap source Linux*Env.Set.sh @@ -978,11 +980,10 @@ sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -# ooo#ooo54091# add Nimbus Roman No9 L as Times New Roman fallback +# ooo#54091# add Nimbus Roman No9 L as Times New Roman fallback sed -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu - #rh#158977# clear execstack requirement execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so @@ -1040,13 +1041,14 @@ if [ $pic == 1 ]; then false; fi if [ $executable == 1 ]; then false; fi -#make up some /usr/bin scripts +#add in a simple crash reporter replacement cp -f %{SOURCE4} $RPM_BUILD_ROOT/%{instdir}/program/crash_report chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report #use ooo-build opens___.ttf with greater coverage cp -f %{SOURCE7} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf +#make up some /usr/bin scripts mkdir -p $RPM_BUILD_ROOT/%{_bindir} echo \#\!/bin/sh > $RPM_BUILD_ROOT/usr/bin/openoffice.org-1.9 Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- sources 1 Sep 2005 08:44:26 -0000 1.110 +++ sources 1 Sep 2005 13:52:59 -0000 1.111 @@ -5,4 +5,4 @@ a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu 73aac8274b29c79ac2041d0963faa2b8 openoffice.org-myspell-contrib.tar.gz 66ee360bd11d33b0ba2283922d853706 opens___.ttf -2193774f15b3309c7caea27c26fee1f7 SRC680_m127.tar.bz2 +77554e59a9b0592b976d8499ea61fa76 SRC680_m127.tar.bz2 From fedora-cvs-commits at redhat.com Thu Sep 1 14:16:19 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 10:16:19 -0400 Subject: rpms/glib2/FC-4 .cvsignore, 1.21, 1.22 glib2.spec, 1.31, 1.32 sources, 1.21, 1.22 Message-ID: <200509011416.j81EGJgs029072@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29058 Modified Files: .cvsignore glib2.spec sources Log Message: 2.6.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 6 Apr 2005 16:06:59 -0000 1.21 +++ .cvsignore 1 Sep 2005 14:16:17 -0000 1.22 @@ -6,3 +6,4 @@ glib-2.6.2.tar.bz2 glib-2.6.3.tar.bz2 glib-2.6.4.tar.bz2 +glib-2.6.6.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/FC-4/glib2.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- glib2.spec 6 Apr 2005 16:06:59 -0000 1.31 +++ glib2.spec 1 Sep 2005 14:16:17 -0000 1.32 @@ -1,6 +1,6 @@ Summary: A library of handy utility functions. Name: glib2 -Version: 2.6.4 +Version: 2.6.6 Release: 1 License: LGPL Group: System Environment/Libraries @@ -98,6 +98,9 @@ %{_mandir}/man1/* %changelog +* Thu Sep 1 2005 Matthias Clasen - 2.6.6-1 +- Update to 2.6.6 + * Wed Apr 6 2005 Matthias Clasen - 2.6.4-1 - Update to 2.6.4 - Drop upstreamed patches Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 6 Apr 2005 16:06:59 -0000 1.21 +++ sources 1 Sep 2005 14:16:17 -0000 1.22 @@ -1 +1 @@ -af7eeb8aae764ff763418471ed6eb93d glib-2.6.4.tar.bz2 +6e22b0639d314536f23ee118f29b43de glib-2.6.6.tar.bz2 From fedora-cvs-commits at redhat.com Thu Sep 1 14:22:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 10:22:49 -0400 Subject: rpms/lockdev/FC-4 lockdev-1.0.1-fcntl.patch, NONE, 1.1 lockdev.spec, 1.18, 1.19 Message-ID: <200509011422.j81EMneu029208@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/lockdev/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29194 Modified Files: lockdev.spec Added Files: lockdev-1.0.1-fcntl.patch Log Message: - add fnctl.h lockdev-1.0.1-fcntl.patch: baudboy.h | 1 + 1 files changed, 1 insertion(+) --- NEW FILE lockdev-1.0.1-fcntl.patch --- --- lockdev-1.0.1/src/baudboy.h.kzak 2005-09-01 15:32:30.000000000 +0200 +++ lockdev-1.0.1/src/baudboy.h 2005-09-01 15:32:49.000000000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { Index: lockdev.spec =================================================================== RCS file: /cvs/dist/rpms/lockdev/FC-4/lockdev.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- lockdev.spec 5 Mar 2005 11:49:15 -0000 1.18 +++ lockdev.spec 1 Sep 2005 14:22:47 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A library for locking devices. Name: lockdev Version: 1.0.1 -Release: 7 +Release: 7.1 License: LGPL Group: System Environment/Libraries Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz @@ -12,6 +12,7 @@ Patch4: lockdev-1.0.1-checkname.patch Patch5: lockdev-1.0.1-pidexists.patch Patch6: lockdev-1.0.1-subdir.patch +Patch7: lockdev-1.0.1-fcntl.patch Prereq: shadow-utils, filesystem >= 2.1.4-1 BuildRoot: %{_tmppath}/%{name}-root @@ -38,6 +39,7 @@ %patch4 -p1 -b .checkname %patch5 -p1 -b .pidexists %patch6 -p1 -b .subdir +%patch7 -p1 -b .fcntl %build make "CFLAGS=${RPM_OPT_FLAGS} -fPIC" @@ -77,6 +79,9 @@ %{_includedir}/* %changelog +* Thu Sep 1 2005 Karel Zak 1.0.1-7.1 +- fix #163276 - baudboy.h should include fcntl.h + * Sat Mar 5 2005 Karel Zak 1.0.1-6 - rebuilt From fedora-cvs-commits at redhat.com Thu Sep 1 14:23:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 10:23:52 -0400 Subject: rpms/gtk2/FC-4 .cvsignore, 1.28, 1.29 gtk2.spec, 1.76, 1.77 sources, 1.30, 1.31 Message-ID: <200509011423.j81ENqT9029298@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29284 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.6.10 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-4/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 13 Apr 2005 04:48:06 -0000 1.28 +++ .cvsignore 1 Sep 2005 14:23:50 -0000 1.29 @@ -11,3 +11,4 @@ gtk+-2.6.5.tar.bz2 gtk+-2.6.6.tar.gz gtk+-2.6.7.tar.bz2 +gtk+-2.6.10.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-4/gtk2.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- gtk2.spec 10 May 2005 13:42:41 -0000 1.76 +++ gtk2.spec 1 Sep 2005 14:23:50 -0000 1.77 @@ -8,13 +8,13 @@ %define atk_version %{atk_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.6.7 +%define base_version 2.6.10 %define bin_version 2.4.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 4 +Release: 1 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -24,8 +24,6 @@ Patch1: gtk+-2.3.2-themename.patch # Biarch changes Patch2: gtk+-2.4.1-lib64.patch -# Remove debug spew from the bmp loader; fixed in 2.6.8 -Patch3: gtk+-2.6.7-spew.patch BuildPrereq: atk-devel >= %{atk_version} BuildPrereq: pango-devel >= %{pango_version} @@ -85,7 +83,6 @@ %patch1 -p1 -b .themename %patch2 -p1 -b .lib64 -%patch3 -p1 -b .spew for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -260,6 +257,10 @@ %doc tmpdocs/examples %changelog +* Thu Sep 1 2005 Matthias Clasen 2.6.10-1 +- new upstream version +- drop upstreamed patch + * Tue May 10 2005 Matthias Clasen - remove the openssl prereq again, as it did not fix Florians problem. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-4/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 13 Apr 2005 04:48:06 -0000 1.30 +++ sources 1 Sep 2005 14:23:50 -0000 1.31 @@ -1,2 +1,2 @@ cc70205392e209ae73eff74e020111f2 update-scripts.tar.gz -b89bf892a0dee943f98b4caa12f773c8 gtk+-2.6.7.tar.bz2 +520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 From fedora-cvs-commits at redhat.com Thu Sep 1 14:52:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 10:52:47 -0400 Subject: rpms/lockdev/devel lockdev-1.0.1-fcntl.patch, NONE, 1.1 lockdev.spec, 1.18, 1.19 Message-ID: <200509011452.j81EqlHQ022731@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/lockdev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22677 Modified Files: lockdev.spec Added Files: lockdev-1.0.1-fcntl.patch Log Message: - add fcntl.h lockdev-1.0.1-fcntl.patch: baudboy.h | 1 + 1 files changed, 1 insertion(+) --- NEW FILE lockdev-1.0.1-fcntl.patch --- --- lockdev-1.0.1/src/baudboy.h.kzak 2005-09-01 15:32:30.000000000 +0200 +++ lockdev-1.0.1/src/baudboy.h 2005-09-01 15:32:49.000000000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { Index: lockdev.spec =================================================================== RCS file: /cvs/dist/rpms/lockdev/devel/lockdev.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- lockdev.spec 5 Mar 2005 11:49:15 -0000 1.18 +++ lockdev.spec 1 Sep 2005 14:52:45 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A library for locking devices. Name: lockdev Version: 1.0.1 -Release: 7 +Release: 8 License: LGPL Group: System Environment/Libraries Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz @@ -12,6 +12,7 @@ Patch4: lockdev-1.0.1-checkname.patch Patch5: lockdev-1.0.1-pidexists.patch Patch6: lockdev-1.0.1-subdir.patch +Patch7: lockdev-1.0.1-fcntl.patch Prereq: shadow-utils, filesystem >= 2.1.4-1 BuildRoot: %{_tmppath}/%{name}-root @@ -38,6 +39,7 @@ %patch4 -p1 -b .checkname %patch5 -p1 -b .pidexists %patch6 -p1 -b .subdir +%patch7 -p1 -b .fcntl %build make "CFLAGS=${RPM_OPT_FLAGS} -fPIC" @@ -77,6 +79,9 @@ %{_includedir}/* %changelog +* Thu Sep 1 2005 Karel Zak 1.0.1-8 +- fix #163276 - baudboy.h should include fcntl.h + * Sat Mar 5 2005 Karel Zak 1.0.1-6 - rebuilt From fedora-cvs-commits at redhat.com Thu Sep 1 15:23:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 11:23:22 -0400 Subject: rpms/libselinux/devel .cvsignore, 1.69, 1.70 libselinux-rhat.patch, 1.49, 1.50 libselinux.spec, 1.110, 1.111 sources, 1.69, 1.70 Message-ID: <200509011523.j81FNMkP007853@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7827 Modified Files: .cvsignore libselinux-rhat.patch libselinux.spec sources Log Message: * Thu Sep 1 2005 Dan Walsh 1.25.6-1 - Update from NSA * Added public functions to export context translation to users of libselinux (selinux_trans_to_raw_context, selinux_raw_to_trans_context). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- .cvsignore 29 Aug 2005 11:59:41 -0000 1.69 +++ .cvsignore 1 Sep 2005 15:23:17 -0000 1.70 @@ -43,3 +43,4 @@ libselinux-1.25.3.tgz libselinux-1.25.4.tgz libselinux-1.25.5.tgz +libselinux-1.25.6.tgz libselinux-rhat.patch: init.c | 2 ++ 1 files changed, 2 insertions(+) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- libselinux-rhat.patch 25 Aug 2005 20:21:14 -0000 1.49 +++ libselinux-rhat.patch 1 Sep 2005 15:23:17 -0000 1.50 @@ -1,21 +1,19 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/src/context.c libselinux-1.25.3/src/context.c ---- nsalibselinux/src/context.c 2005-08-25 16:18:01.000000000 -0400 -+++ libselinux-1.25.3/src/context.c 2005-08-24 16:48:20.000000000 -0400 -@@ -181,16 +180,8 @@ - def_set(type,COMP_TYPE) - def_set(role,COMP_ROLE) - def_set(user,COMP_USER) -+def_set(range,COMP_RANGE) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-1.25.6/src/init.c +--- nsalibselinux/src/init.c 2005-08-25 16:18:01.000000000 -0400 ++++ libselinux-1.25.6/src/init.c 2005-09-01 11:23:11.000000000 -0400 +@@ -86,6 +86,7 @@ + { + int (*lib_trans_init)(void) = NULL; --int context_range_set(context_t context,const char* str) --{ -- context_private_t *n = context->ptr; -- if ( ! n->component[COMP_RANGE] ) { -- return 0; -- } else { -- return set_comp(n,COMP_RANGE,str); -- } --} - hidden_def(context_range_set) ++#ifdef __PIC__ + translation_lib_handle = dlopen("libsetrans.so.0", RTLD_NOW); + if (!translation_lib_handle) + return; +@@ -108,6 +109,7 @@ + return; - #ifdef L1TEST + context_translations = 1; ++#endif + } + + static void fini_translations(void) Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- libselinux.spec 29 Aug 2005 11:59:41 -0000 1.110 +++ libselinux.spec 1 Sep 2005 15:23:17 -0000 1.111 @@ -1,10 +1,11 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 1.25.5 +Version: 1.25.6 Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz +Patch: libselinux-rhat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -34,6 +35,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make CFLAGS="-g %{optflags}" @@ -83,6 +85,12 @@ %{_mandir}/man8/* %changelog +* Thu Sep 1 2005 Dan Walsh 1.25.6-1 +- Update from NSA + * Added public functions to export context translation to + users of libselinux (selinux_trans_to_raw_context, + selinux_raw_to_trans_context). + * Mon Aug 29 2005 Dan Walsh 1.25.5-1 - Update from NSA * Remove special definition for context_range_set; use Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- sources 29 Aug 2005 11:59:41 -0000 1.69 +++ sources 1 Sep 2005 15:23:17 -0000 1.70 @@ -1 +1 @@ -93382e8d891c90d40e973ed61c10a76c libselinux-1.25.5.tgz +8bf97b33ed29d9a7a8b5d6c285310013 libselinux-1.25.6.tgz From fedora-cvs-commits at redhat.com Thu Sep 1 15:50:40 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 11:50:40 -0400 Subject: rpms/libsepol/devel .cvsignore, 1.39, 1.40 libsepol.spec, 1.56, 1.57 sources, 1.39, 1.40 Message-ID: <200509011550.j81FoeWj016215@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16203 Modified Files: .cvsignore libsepol.spec sources Log Message: * Thu Sep 1 2005 Dan Walsh 1.7.24-1 - Upgrade to latest from NSA * Fixed symtab_insert return value for duplicate declarations. * Merged fix for memory error in policy_module_destroy from Jason Tang (Tresys). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 29 Aug 2005 12:02:32 -0000 1.39 +++ .cvsignore 1 Sep 2005 15:50:37 -0000 1.40 @@ -36,3 +36,4 @@ libsepol-1.7.19.tgz libsepol-1.7.20.tgz libsepol-1.7.22.tgz +libsepol-1.7.24.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- libsepol.spec 29 Aug 2005 12:02:32 -0000 1.56 +++ libsepol.spec 1 Sep 2005 15:50:37 -0000 1.57 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.7.22 +Version: 1.7.24 Release: 1 License: GPL Group: System Environment/Libraries @@ -73,6 +73,12 @@ /%{_lib}/libsepol.so.1 %changelog +* Thu Sep 1 2005 Dan Walsh 1.7.24-1 +- Upgrade to latest from NSA + * Fixed symtab_insert return value for duplicate declarations. + * Merged fix for memory error in policy_module_destroy from + Jason Tang (Tresys). + * Mon Aug 29 2005 Dan Walsh 1.7.22-1 - Upgrade to latest from NSA * Merged fix for memory leak in sepol_context_to_sid from Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 29 Aug 2005 12:02:32 -0000 1.39 +++ sources 1 Sep 2005 15:50:37 -0000 1.40 @@ -1 +1 @@ -c07d8e744eba2d8c62241b340578a5e7 libsepol-1.7.22.tgz +92ad3498d12a7e78abf7a21b034889d8 libsepol-1.7.24.tgz From fedora-cvs-commits at redhat.com Thu Sep 1 16:17:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 12:17:09 -0400 Subject: rpms/checkpolicy/devel checkpolicy.spec,1.50,1.51 Message-ID: <200509011617.j81GH9YC023096@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23084 Modified Files: checkpolicy.spec Log Message: * Thu Sep 1 2005 Dan Walsh 1.25.12-3 - Rebuild to get latest libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- checkpolicy.spec 29 Aug 2005 14:22:45 -0000 1.50 +++ checkpolicy.spec 1 Sep 2005 16:17:07 -0000 1.51 @@ -1,8 +1,8 @@ -%define libsepolver 1.7.22-1 +%define libsepolver 1.7.24-1 Summary: SELinux policy compiler Name: checkpolicy Version: 1.25.12 -Release: 2 +Release: 3 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -44,6 +44,9 @@ %{_mandir}/man8/checkpolicy.8.gz %changelog +* Thu Sep 1 2005 Dan Walsh 1.25.12-3 +- Rebuild to get latest libsepol + * Mon Aug 29 2005 Dan Walsh 1.25.12-2 - Rebuild to get latest libsepol From fedora-cvs-commits at redhat.com Thu Sep 1 16:17:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 12:17:42 -0400 Subject: rpms/policycoreutils/devel .cvsignore, 1.62, 1.63 policycoreutils-rhat.patch, 1.98, 1.99 policycoreutils.spec, 1.136, 1.137 sources, 1.65, 1.66 Message-ID: <200509011617.j81GHg6w023161@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23144 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Thu Sep 1 2005 Dan Walsh 1.25.9-1 - Update to match NSA * Changed setfiles -c to translate the context to raw format prior to calling libsepol. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 25 Aug 2005 20:44:24 -0000 1.62 +++ .cvsignore 1 Sep 2005 16:17:38 -0000 1.63 @@ -46,3 +46,4 @@ policycoreutils-1.25.5.tgz policycoreutils-1.25.6.tgz policycoreutils-1.25.7.tgz +policycoreutils-1.25.9.tgz policycoreutils-rhat.patch: policycoreutils-1.25.7/scripts/fixfiles | 8 ++ semodule_package/Makefile | 3 + semodule_package/semod.conf | 96 ++++++++++++++++++++++++++++++++ setfiles/setfiles.8 | 3 + setfiles/setfiles.c | 4 - 5 files changed, 110 insertions(+), 4 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- policycoreutils-rhat.patch 26 Aug 2005 18:23:35 -0000 1.98 +++ policycoreutils-rhat.patch 1 Sep 2005 16:17:38 -0000 1.99 @@ -1,24 +1,169 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.25.7/restorecon/restorecon.c ---- nsapolicycoreutils/restorecon/restorecon.c 2005-07-27 09:58:39.000000000 -0400 -+++ policycoreutils-1.25.7/restorecon/restorecon.c 2005-08-26 14:20:10.000000000 -0400 -@@ -186,7 +186,7 @@ - freecon(scontext); - return 0; - } -- retcontext=lgetfilecon(filename,&prev_context); -+ retcontext=lgetfilecon_raw(filename,&prev_context); - - if (retcontext >= 0 || errno == ENODATA) { - int customizable=0; -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.25.7/setfiles/setfiles.c ---- nsapolicycoreutils/setfiles/setfiles.c 2005-04-11 16:00:46.000000000 -0400 -+++ policycoreutils-1.25.7/setfiles/setfiles.c 2005-08-26 14:20:28.000000000 -0400 -@@ -285,7 +285,7 @@ - } +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.25.7/scripts/fixfiles +--- nsapolicycoreutils/scripts/fixfiles 2005-08-25 16:18:08.000000000 -0400 ++++ policycoreutils-1.25.7/scripts/fixfiles 2005-08-26 16:05:39.000000000 -0400 +@@ -61,7 +61,11 @@ + if [ -f ${PREFC} -a -x /usr/bin/diff ]; then + TEMPFILE=`mktemp ${FC}.XXXXXXXXXX` + test -z "$TEMPFILE" && exit +- /usr/bin/diff $PREFC $FC | grep '^[<>]'|cut -c3-| grep ^/ | \ ++ PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX` ++ sed -r -e 's,:s0[[:space:]], ,g' $PREFC > ${PREFCTEMPFILE} ++ sed -r -e 's,:s0[[:space:]], ,g' $FC | \ ++ /usr/bin/diff -b ${PREFCTEMPFILE} - | \ ++ grep '^[<>]'|cut -c3-| grep ^/ | \ + egrep -v '(^/home|^/root|^/tmp|^/dev)' |\ + sed -r -e 's,[[:blank:]].*,,g' \ + -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \ +@@ -85,7 +89,7 @@ + while read pattern ; do find $pattern \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -print; done 2> /dev/null | \ + egrep -v '(^/home|^/root|^/tmp|^/dev)' |\ + ${RESTORECON} $2 -v -f - +- rm -f ${TEMPFILE} ++ rm -f ${TEMPFILE} ${PREFCTEMPFILE} + fi + } + # +--- nsapolicycoreutils/semodule_package/Makefile 2005-07-28 09:46:02.000000000 -0400 ++++ policycoreutils-1.25.7/semodule_package/Makefile 2005-08-30 10:31:41.000000000 -0400 +@@ -3,6 +3,7 @@ + INCLUDEDIR ?= $(PREFIX)/include + BINDIR ?= $(PREFIX)/bin + LIBDIR ?= ${PREFIX}/lib ++SELINUXDIR ?= ${DESTDIR}/etc/selinux + + CFLAGS ?= -Werror -Wall -W + override CFLAGS += -I$(INCLUDEDIR) +@@ -14,7 +15,9 @@ + + install: all + -mkdir -p $(BINDIR) ++ -mkdir -p $(SELINUXDIR) + install -m 755 semodule_package $(BINDIR) ++ install -m 640 semod.conf $(SELINUXDIR)/semod.conf - /* Get the current context of the file. */ -- ret = lgetfilecon(my_file, &context); -+ ret = lgetfilecon_raw(my_file, &context); - if (ret < 0) { - if (errno == ENODATA) { - context = malloc(10); + relabel: + +--- nsapolicycoreutils/semodule_package/semod.conf 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.25.7/semodule_package/semod.conf 2005-08-30 10:24:54.000000000 -0400 +@@ -0,0 +1,96 @@ ++# Authors: Jason Tang ++# ++# Copyright (C) 2004-2005 Tresys Technology, LLC ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License as published by the Free Software Foundation; either ++# version 2.1 of the License, or (at your option) any later version. ++# ++# This library is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with this library; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++# Specify how libsemanage will interact with the module store. The three ++# options are: ++# ++# "direct" - libsemanage will write directly to the store. ++# /foo/bar - Write by way of a policy server, whose named socket ++# is at /foo/bar. The path must begin with a '/'. ++# foo.com:4242 - Establish a TCP connection to a remote policy server ++# at foo.com. If there is a colon then the remainder ++# is interpreted as a port number; otherwise default ++# to port 4242. ++module-store = direct ++ ++# When generating the final linked and expanded policy, by default ++# semodule will set the policy version to POLICYDB_VERSION_MAX, as ++# given in . Change this setting if a different ++# version is necessary. ++#policy-version = 19 ++ ++# After a policy has been created this library will attempt to load it ++# by calling the load_policy utility. If there are special ++# requirements (e.g., read booleans from a certain file) then add them ++# here. Below are the default values. Within 'args', the special ++# sequence "$@" will be replaced with the policy filename. ++#[load_policy] ++#path = /usr/sbin/load_policy ++#args = -b $@ ++#[end] ++ ++# In addition to loading a policy libsemanage will validate file contexts ++# by calling the setfiles utility. As above, "$@" will be replaced ++# with the policy filename. In addition "$<" will be replaced with ++# the file contexts filename. ++#[setfiles] ++#path = /usr/sbin/setfiles ++#args = -q -c $@ $< ++#[end] ++ ++# Each program specified within a [verify] block is run during ++# committing. There are three types of verifies allowed: module, ++# linked, and kernel. Multiple verifies may exist for a stage; place ++# each program within its own [verify] block. For each stage the ++# programs are executed in the order given below. If a program ever ++# returns a non-zero value then the entire commit is aborted. ++# ++# Module verifies are executed for each source module prior to ++# linking. After they have been linked each link verifier is run ++# against the linked base module. Finally, each kernel verifier is ++# run against the final expanded kernel policy. If these verifiers ++# all exit with a return value of 0 then that kernel policy will be ++# loaded. ++# ++# 'path' gives a path the verificaton program. 'args' is any ++# free-form string that supplies command line arguments to the ++# verifier. Within args single quotes, double quotes, and backslashes ++# are metacharacters handled similarly to bash. Within 'args', the ++# special sequence "$@" will be replaced with a filename to the entity ++# being checked: source module for module verifiers, linked module for ++# linked, kernel policy for kernel. The sequence "$<" will be ++# replaced with the previous filename, if applicable. If an older ++# version does not exist "$<" expands to an empty string. ++#[verify module] ++#path = /usr/bin/some_module_verifier ++#args = -Wall -ansi -pedantic $@ $< ++#[end] ++ ++#[verify module] ++#path = /another/module/verify/program ++#args = -With -some_more arguments ++#[end] ++ ++#[verify linked] ++#path = /usr/local/bin/some_link_verifier ++#[end] ++ ++#[verify kernel] ++#path = /usr/sbin/kernel_verifier ++#args = "some argument" "some other parameter" -k $@ ++#[end] +--- nsapolicycoreutils/setfiles/setfiles.8 2005-03-17 10:29:50.000000000 -0500 ++++ policycoreutils-1.25.7/setfiles/setfiles.8 2005-08-29 12:52:49.000000000 -0400 +@@ -35,6 +35,9 @@ + .B \-q + suppress non-error output. + .TP ++.B \-r ++use an alternate root path ++.TP + .B \-e directory + directory to exclude (repeat option for more than one directory.) + .TP +--- nsapolicycoreutils/setfiles/setfiles.c 2005-04-11 16:00:46.000000000 -0400 ++++ policycoreutils-1.25.7/setfiles/setfiles.c 2005-08-29 12:50:56.000000000 -0400 +@@ -198,8 +198,8 @@ + void usage(const char * const name) + { + fprintf(stderr, +- "usage: %s [-dnqvW] [-o filename] spec_file pathname...\n" +- "usage: %s [-c policyfile] spec_file\n" ++ "usage: %s [-dnqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n" ++ "usage: %s -c policyfile spec_file\n" + "usage: %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, name); + exit(1); + } Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- policycoreutils.spec 26 Aug 2005 18:52:18 -0000 1.136 +++ policycoreutils.spec 1 Sep 2005 16:17:38 -0000 1.137 @@ -1,18 +1,18 @@ -%define libselinuxver 1.25.4-1 -%define libsepolver 1.7.20-1 -%define libsemanagever 1.1.3-1 +%define libselinuxver 1.25.6-1 +%define libsepolver 1.7.24-1 +%define libsemanagever 1.1.4-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.25.7 +Version: 1.25.9 Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz -#Patch: policycoreutils-rhat.patch +Patch: policycoreutils-rhat.patch BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} -Requires: libselinux >= %{libselinuxver} libsepol >= %{libsepolver} +Requires: libselinux >= %{libselinuxver} libsepol >= %{libsepolver} BuildRoot: %{_tmppath}/%{name}-buildroot @@ -35,6 +35,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all @@ -83,10 +84,22 @@ %{_mandir}/man1/audit2allow.1.gz %{_mandir}/man1/newrole.1.gz %config %{_sysconfdir}/pam.d/newrole +%config %{_sysconfdir}/selinux/semod.conf %config %{_sysconfdir}/pam.d/run_init %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Thu Sep 1 2005 Dan Walsh 1.25.9-1 +- Update to match NSA + * Changed setfiles -c to translate the context to raw format + prior to calling libsepol. + +* Fri Aug 26 2005 Dan Walsh 1.25.7-3 +- Use new version of libsemange and require it for install + +* Fri Aug 26 2005 Dan Walsh 1.25.7-2 +- Ignore s0 in file context + * Thu Aug 25 2005 Dan Walsh 1.25.7-1 - Update to match NSA * Merged patch for fixfiles -C from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 25 Aug 2005 20:44:24 -0000 1.65 +++ sources 1 Sep 2005 16:17:38 -0000 1.66 @@ -1 +1 @@ -5139e99f462c5ae689f105d47adf0ce5 policycoreutils-1.25.7.tgz +cefb5a0c070be495b8e0ab07229137a8 policycoreutils-1.25.9.tgz From fedora-cvs-commits at redhat.com Thu Sep 1 16:26:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 12:26:36 -0400 Subject: rpms/libsemanage/devel .cvsignore, 1.3, 1.4 libsemanage.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200509011626.j81GQaUT032341@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32310 Modified Files: .cvsignore libsemanage.spec sources Log Message: * Thu Sep 1 2005 Dan Walsh 1.1.6-1 - Update from NSA * Merged semod.conf template patch from Dan Walsh (Red Hat), but restored location to /usr/share/semod/semod.conf. * Fixed several bugs found by valgrind. * Fixed bug in prior patch for the semod_build_module_list leak. * Merged errno fix from Joshua Brindle (Tresys). * Merged fix for semod_build_modules_list leak on error path from Serge Hallyn (IBM). Bug found by Coverity. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Aug 2005 13:46:52 -0000 1.3 +++ .cvsignore 1 Sep 2005 16:26:33 -0000 1.4 @@ -1,2 +1,3 @@ libsemanage-1.0.tgz libsemanage-1.1.4.tgz +libsemanage-1.1.6.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libsemanage.spec 30 Aug 2005 14:22:49 -0000 1.3 +++ libsemanage.spec 1 Sep 2005 16:26:33 -0000 1.4 @@ -1,11 +1,10 @@ Summary: SELinux binary policy manipulation library Name: libsemanage-devel -Version: 1.1.4 +Version: 1.1.6 Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot %description @@ -30,7 +29,6 @@ %prep %setup -q -n libsemanage-%{version} -%patch -p1 -b .rhat %build make CFLAGS="%{optflags}" @@ -41,6 +39,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_includedir} make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install +rm -rf ${RPM_BUILD_ROOT}/usr/share/semod/semod.conf %clean rm -rf ${RPM_BUILD_ROOT} @@ -50,7 +49,17 @@ %{_includedir}/semanage/*.h %changelog -* Thu Jul 7 2005 Dan Walsh 1.0-1 +* Thu Sep 1 2005 Dan Walsh 1.1.6-1 +- Update from NSA + * Merged semod.conf template patch from Dan Walsh (Red Hat), + but restored location to /usr/share/semod/semod.conf. + * Fixed several bugs found by valgrind. + * Fixed bug in prior patch for the semod_build_module_list leak. + * Merged errno fix from Joshua Brindle (Tresys). + * Merged fix for semod_build_modules_list leak on error path + from Serge Hallyn (IBM). Bug found by Coverity. + +* Thu Aug 25 2005 Dan Walsh 1.1.3-1 - Update from NSA * Merged errno fix from Joshua Brindle (Tresys). * Merged fix for semod_build_modules_list leak on error path Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Aug 2005 13:46:52 -0000 1.3 +++ sources 1 Sep 2005 16:26:33 -0000 1.4 @@ -1 +1 @@ -8b23484ef885b373eeb517c2b0db038c libsemanage-1.1.4.tgz +b79c87427276bc8c2cda2064b321be8b libsemanage-1.1.6.tgz From fedora-cvs-commits at redhat.com Thu Sep 1 16:27:50 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 12:27:50 -0400 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.99,1.100 Message-ID: <200509011627.j81GRofl000501@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv473 Modified Files: policycoreutils-rhat.patch Log Message: * Thu Sep 1 2005 Dan Walsh 1.25.9-1 - Update to match NSA * Changed setfiles -c to translate the context to raw format prior to calling libsepol. policycoreutils-rhat.patch: policycoreutils-1.25.7/scripts/fixfiles | 8 ++ semodule_package/Makefile | 3 + semodule_package/semod.conf | 96 ++++++++++++++++++++++++++++++++ setfiles/setfiles.8 | 3 + setfiles/setfiles.c | 4 - 5 files changed, 110 insertions(+), 4 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- policycoreutils-rhat.patch 1 Sep 2005 16:17:38 -0000 1.99 +++ policycoreutils-rhat.patch 1 Sep 2005 16:27:48 -0000 1.100 @@ -29,7 +29,7 @@ INCLUDEDIR ?= $(PREFIX)/include BINDIR ?= $(PREFIX)/bin LIBDIR ?= ${PREFIX}/lib -+SELINUXDIR ?= ${DESTDIR}/etc/selinux ++SELINUXDIR ?= ${DESTDIR}/usr/share/semod CFLAGS ?= -Werror -Wall -W override CFLAGS += -I$(INCLUDEDIR) From fedora-cvs-commits at redhat.com Thu Sep 1 16:28:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 12:28:52 -0400 Subject: rpms/openoffice.org/devel workspace.gslpatches6.patch, NONE, 1.1 openoffice.org.spec, 1.437, 1.438 openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch, 1.1, NONE openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch, 1.1, NONE openoffice.org-1.9.127.ooo54091.korean.officecfg.patch, 1.1, NONE Message-ID: <200509011628.j81GSqi4000990@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv961 Modified Files: openoffice.org.spec Added Files: workspace.gslpatches6.patch Removed Files: openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch openoffice.org-1.9.127.ooo54091.korean.officecfg.patch Log Message: both boosts in trouble workspace.gslpatches6.patch: officecfg/registry/data/org/openoffice/VCL.xcu | 190 ++++++++++++------------- vcl/unx/source/gdi/salprnpsp.cxx | 3 2 files changed, 96 insertions(+), 97 deletions(-) --- NEW FILE workspace.gslpatches6.patch --- Index: registry/data/org/openoffice/VCL.xcu =================================================================== RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v retrieving revision 1.44 retrieving revision 1.44.6.2 diff -u -r1.44 -r1.44.6.2 --- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 25 Aug 2005 16:10:07 -0000 1.44 +++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 13:45:48 -0000 1.44.6.2 @@ -94,7 +94,7 @@ Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma @@ -127,7 +127,7 @@ Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif - Thorndale;Times New Roman;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol @@ -163,13 +163,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -198,13 +198,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -233,13 +233,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -268,13 +268,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -303,13 +303,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -338,13 +338,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -373,13 +373,13 @@ Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Albany;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - Thorndale;Times New Roman;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif Cumberland;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -460,31 +460,31 @@ - HG ??????L Sun;HG MinchoL Sun;HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG Mincho Light J;MS P ??????;TLP??????;LX??????;IPA P??????;????????????;Kochi Mincho;??????????????????;Mincho;Serif + HG ??????L Sun;HG MinchoL Sun;HG P????????????B Sun;Sazanami Mincho;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG Mincho Light J;MS P ??????;TLP??????;LX??????;IPA P??????;????????????;Kochi Mincho;??????????????????;Mincho;Serif - HG ??????L Sun;HG ??????L;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Gothic;MS ??????;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS P ??????;HG Mincho Light J;MS ????????????;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS P ????????????;Andale Sans UI + HG ??????L Sun;HG ??????L;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Gothic;MS ??????;HG Mincho J;HG Mincho L;HG Mincho;Mincho;Sazanami Mincho;MS P ??????;HG Mincho Light J;MS ????????????;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS P ????????????;Andale Sans UI - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;MS ????????????;MS P ????????????;HG Gothic;HG Gothic B;Gothic;Andale Sans UI + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;Sazanami Gothic;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;MS ????????????;MS P ????????????;HG Gothic;HG Gothic B;Gothic;Andale Sans UI Andale;Arial - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Sazanami Gothic;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;Andale Sans UI;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;Gothic + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;Sazanami Gothic;Andale Sans UI;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;Gothic - HG ????????????B Sun;HG-GothicB Sun;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic + HG ????????????B Sun;HG-GothicB Sun;Sazanami Gothic;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic - HG ????????????B Sun;HG-GothicB Sun;HG ????????????B;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic + HG ????????????B Sun;HG-GothicB Sun;HG ????????????B;Sazanami Gothic;HG Mincho Light J;MS P ????????????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic - HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;Andale Sans UI;HG Mincho Light J;??????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic;Gnu-Unifont + HG P????????????B Sun;HG-PGothicB Sun;HG P????????????B;HG-PGothicB;HG-GothicB;Sazanami Gothic;Andale Sans UI;HG Mincho Light J;??????;TLP????????????;LX????????????;IPA P????????????;??????????????????;????????????????????????;Kochi Gothic;Gothic;Gnu-Unifont hgmincholightj;cumberland;couriernew;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced @@ -492,173 +492,171 @@ - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light SC;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;ZYSong18030;AR PL ShanHeiSun Uni;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;MingLiU;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;MingLiU;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;MingLiU;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - FZHeiTi;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + FZHeiTi;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - FZHeiTi;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + FZHeiTi;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ????????????;MSung Light TC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ????????????;MSung Light TC;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif + Andale Sans UI;AR PL ShanHeiSun Uni;AR PL Mingti2L Big5;AR PL KaitiM Big5;PMingLiU;MingLiU;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif - ?????????;SunGulim;??????;Gulim;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ?????????;SunDotum;??????;Dotum;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunBatang;??????;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Baekmuk Dotum;Gulim;Roundgothic;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunDotum;??????;Dotum;????????????;BaekmukDotum;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;????????????;BaekmukDotum;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic - ?????????;SunBatang;Batang;Myeongjo;?????????;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunBatang;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunDotum;??????;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;??????;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma - ?????????;SunGulim;??????;Gulim;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif - ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif + ?????????;SunGulim;??????;Gulim;Batang;Myeongjo;Baekmuk Dotum;Gulim;Roundgothic;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif - ?????????;SunGulim;??????;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Roundgothic;Andale Sans UI;Arial Unicode MS - ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunBatang;??????;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunGulim;??????;Gulim;??????;Batang;Myeongjo;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunGulim;??????;Gulim;??????;Batang;Myeongjo;Baekmuk Dotum;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunDotum;??????;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunDotum;??????;Baekmuk Dotum;Dotum;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunBatang;??????;Batang;Myeongjo;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode + ?????????;SunBatang;??????;Batang;Myeongjo;Baekmuk Dotum;?????????;SunGulim;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode - ?????????;SunGulim;??????;Gulim;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced - ?????????;sungulim;??????;Gulim;RoundGothic;Arial Unicode MS;Lucida Sans Unicode;AndaleSansUI;GNU-Unifont + ?????????;sungulim;??????;Gulim;Baekmuk Dotum;RoundGothic;Arial Unicode MS;Lucida Sans Unicode;AndaleSansUI;GNU-Unifont - ?????????;SunGulim;;??????;Gulim;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced + ?????????;SunGulim;??????;Gulim;Baekmuk Dotum;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced @@ -1024,7 +1022,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting @@ -1347,7 +1345,7 @@ - bookman;itcbookman;bookmanl;bookmanoldstyle;;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino + bookman;itcbookman;bookmanl;bookmanoldstyle;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino @@ -1370,7 +1368,7 @@ - bookman;itcbookman;bookmanl;bookmanoldstyle;;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino + bookman;itcbookman;bookmanl;bookmanoldstyle;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino @@ -1393,7 +1391,7 @@ - bookman;itcbookman;bookmanl;bookmanoldstyle;;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino + bookman;itcbookman;bookmanl;bookmanoldstyle;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino @@ -1416,7 +1414,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley @@ -1761,7 +1759,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley @@ -1807,7 +1805,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting @@ -1830,7 +1828,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting @@ -1991,7 +1989,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley @@ -2014,7 +2012,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley @@ -2405,7 +2403,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting @@ -2612,7 +2610,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley @@ -3927,7 +3925,7 @@ - zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;comicsansms;kidprint;;palacescript;palacescriptmt;arioso;shelley + zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;comicsansms;kidprint;palacescript;palacescriptmt;arioso;shelley @@ -3973,7 +3971,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting @@ -4019,7 +4017,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting @@ -4295,7 +4293,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley @@ -6726,7 +6724,7 @@ - comicsansms;kidprint;;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley + comicsansms;kidprint;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;palacescript;palacescriptmt;arioso;shelley Index: unx/source/gdi/salprnpsp.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v retrieving revision 1.37 retrieving revision 1.37.180.1 diff -u -r1.37 -r1.37.180.1 --- openoffice.org.orig/vcl/unx/source/gdi/salprnpsp.cxx 30 Mar 2005 09:09:56 -0000 1.37 +++ openoffice.org/vcl/unx/source/gdi/salprnpsp.cxx 25 Aug 2005 06:51:32 -0000 1.37.180.1 @@ -284,7 +284,8 @@ const PPDValue* pValue = NULL; pJobSetup->mnPaperBin = 0xffff; - pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ); + if( rData.m_pParser ) + pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ); if( pKey ) pValue = rData.m_aContext.getValue( pKey ); if( pKey && pValue ) Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.437 retrieving revision 1.438 diff -u -r1.437 -r1.438 --- openoffice.org.spec 1 Sep 2005 13:52:59 -0000 1.437 +++ openoffice.org.spec 1 Sep 2005 16:28:49 -0000 1.438 @@ -172,9 +172,7 @@ Patch52: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch Patch53: workspace.impress57.patch Patch54: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch -Patch55: openoffice.org-1.9.127.ooo54091.korean.officecfg.patch -Patch56: openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch -Patch57: openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch +Patch55: workspace.gslpatches6.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -829,9 +827,7 @@ %patch52 -p1 -b .oooXXXXX.uselibxslt.xmlhelp.patch %patch53 -p1 -b .workspace.impress57.patch %patch54 -p1 -b .ooo54040.savecrash.svtools.patch -%patch55 -p1 -b .ooo54091.korean.officecfg.patch -%patch56 -p1 -b .ooo54091.japanese.officecfg.patch -%patch57 -p1 -b .ooo54091.chinese.officecfg.patch +%patch55 -p1 -b .workspace.gslpatches6.patch %if %{includeexternals} #start ludicrous workaround @@ -866,9 +862,7 @@ fi cd config_office autoconf -# system boost fucked -#%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang} -%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang} +%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang} cd .. ./bootstrap source Linux*Env.Set.sh @@ -980,10 +974,6 @@ sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -# ooo#54091# add Nimbus Roman No9 L as Times New Roman fallback -sed -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu - #rh#158977# clear execstack requirement execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so --- openoffice.org-1.9.127.ooo54091.chinese.officecfg.patch DELETED --- --- openoffice.org-1.9.127.ooo54091.japanese.officecfg.patch DELETED --- --- openoffice.org-1.9.127.ooo54091.korean.officecfg.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Sep 1 17:04:54 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 13:04:54 -0400 Subject: rpms/OpenIPMI/devel OpenIPMI.spec, 1.11, 1.12 openipmi.initscript, 1.4, 1.5 Message-ID: <200509011704.j81H4sJP021002@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/OpenIPMI/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20931 Modified Files: OpenIPMI.spec openipmi.initscript Log Message: - Updated initscript to latest version from Dell Index: OpenIPMI.spec =================================================================== RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- OpenIPMI.spec 12 Aug 2005 15:54:50 -0000 1.11 +++ OpenIPMI.spec 1 Sep 2005 17:04:49 -0000 1.12 @@ -2,7 +2,7 @@ Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 1.4.14 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -124,6 +124,9 @@ %{_libdir}/*.a %changelog +* Thu Sep 01 2005 Phil Knirsch 1.4.14-8 +- Updated initscript to latest version from Dell + * Fri Aug 12 2005 Phil Knirsch 1.4.14-7 - Fixed the unwanted output of failed module loading of the initscript. Behaves now like all our other initscripts (#165476) Index: openipmi.initscript =================================================================== RCS file: /cvs/dist/rpms/OpenIPMI/devel/openipmi.initscript,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openipmi.initscript 12 Aug 2005 15:54:50 -0000 1.4 +++ openipmi.initscript 1 Sep 2005 17:04:50 -0000 1.5 @@ -19,6 +19,15 @@ # Description: OpenIPMI Driver init script ### END INIT INFO # +# Exit Status values +# from start: +# 0 = no errors +# 1 = a necessary requested module did not load (error) +# 2 = an optional but requested module did not load (warning) +# 2 = could not create the proper /dev device node (warning) + + +# ############################################################################# # for log_success_msg and friends [ -r /lib/lsb/init-functions ] && . /lib/lsb/init-functions @@ -53,82 +62,81 @@ ############################################################################# load_si() { - if [ "${IPMI_SI}" = "1" ]; then - modprobe ${IPMI_SI_MODULE_NAME} || RETVAL=1 - fi + if [ "${IPMI_SI}" = "1" ]; then + modprobe ${IPMI_SI_MODULE_NAME} || RETVAL=1 + fi } load_smb() { - if [ "${IPMI_SMB}" = "1" ]; then - modprobe ${IPMI_SMB_MODULE_NAME} || RETVAL=1 - fi + if [ "${IPMI_SMB}" = "1" ]; then + modprobe ${IPMI_SMB_MODULE_NAME} || RETVAL=1 + fi } load_hw_modules() { - load_si - load_smb + load_si + load_smb } start_watchdog() { - if [ "${IPMI_WATCHDOG}" = "1" ]; then - load_hw_modules - modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} || RETVAL=2 - if [ ! -x /sbin/udev -a ! -e /dev/watchdog ]; then - mknod -m 0600 /dev/watchdog 10 130 || RETVAL=2 + if [ "${IPMI_WATCHDOG}" = "1" ]; then + load_hw_modules + modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} || RETVAL=2 + if [ ! -x /sbin/udev -a ! -e /dev/watchdog ]; then + mknod -m 0600 /dev/watchdog c 10 130 || RETVAL=2 + fi fi - fi } stop_watchdog() { - modprobe -q -r ipmi_watchdog - [ ! -x /sbin/udev ] && rm /dev/watchdog + modprobe -q -r ipmi_watchdog + [ ! -x /sbin/udev ] && rm -f /dev/watchdog } start_powercontrol() { - local poweroff_opts="" - if [ "${IPMI_POWEROFF}" = "1" ]; then - load_hw_modules - [ "${IPMI_POWERCYCLE}" == "1" ] && poweroff_opts="poweroff_control=2" - modprobe ipmi_poweroff "${poweroff_opts}" || RETVAL=2 - fi + local poweroff_opts="" + if [ "${IPMI_POWEROFF}" = "1" ]; then + load_hw_modules + [ "${IPMI_POWERCYCLE}" == "1" ] && poweroff_opts="poweroff_control=2" + modprobe ipmi_poweroff "${poweroff_opts}" || RETVAL=2 + fi } stop_powercontrol() { - modprobe -q -r ipmi_poweroff + modprobe -q -r ipmi_poweroff } ############################################################################# unload_all_ipmi_modules() { - [ ! -x /sbin/udev ] && rm -f "/dev/ipmi${INTF_NUM}" - stop_watchdog - for m in ${MODULES}; do - modprobe -q -r ${m} - done + [ ! -x /sbin/udev ] && rm -f "/dev/ipmi${INTF_NUM}" + stop_watchdog + for m in ${MODULES}; do + modprobe -q -r ${m} + done } unload_ipmi_modules_leave_features() { - [ ! -x /sbin/udev ] && rm -f "/dev/ipmi${INTF_NUM}" - for m in ${MODULES_INTERFACES}; do - modprobe -q -r ${m} - done - lsmod | egrep -q "ipmi_poweroff|ipmi_watchdog" - if [ "$?" -ne "0" ]; then - stop_watchdog - for m in ${MODULES}; do - modprobe -q -r ${m} + [ ! -x /sbin/udev ] && rm -f "/dev/ipmi${INTF_NUM}" + for m in ${MODULES_INTERFACES}; do + modprobe -q -r ${m} done - fi + lsmod | egrep -q "ipmi_(poweroff|watchdog)" + if [ "$?" -ne "0" ]; then + stop_watchdog + for m in ${MODULES}; do + modprobe -q -r ${m} + done + fi } - ############################################################################# load_ipmi_modules () { @@ -140,21 +148,23 @@ start_powercontrol if [ "${DEV_IPMI}" = "1" ]; then - modprobe ipmi_devintf || RETVAL=2 - if [ "${RETVAL}" != "2" ]; then - if [ ! -x /sbin/udev ]; then - DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'` - mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=2 + modprobe ipmi_devintf || RETVAL=2 + if [ "${RETVAL}" != "2" ]; then + if [ ! -x /sbin/udev ]; then + DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'` + rm -f /dev/ipmi${INTF_NUM} + mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=2 + fi fi - fi fi if [ "${IPMI_IMB}" = "1" ]; then - modprobe ipmi_imb || RETVAL=2 - if [ "${RETVAL}" != "2" ]; then - DEVMAJOR=`cat /proc/devices | awk '/imb/{print $1}'` - mknod -m 0600 /dev/imb c ${DEVMAJOR} 0 || RETVAL=2 - fi + modprobe ipmi_imb || RETVAL=2 + if [ "${RETVAL}" != "2" ]; then + DEVMAJOR=`cat /proc/devices | awk '/imb/{print $1}'` + rm -f /dev/imb + mknod -m 0600 /dev/imb c ${DEVMAJOR} 0 || RETVAL=2 + fi fi # Per Corey Minyard, essentially no one uses ipmi_radisys @@ -166,61 +176,146 @@ ############################################################################# start() { - echo -n $"Starting ${MODULE_NAME} drivers: " - load_ipmi_modules >/dev/null 2>&1 - [ "${RETVAL}" = "1" ] && log_failure_msg && return - [ "${RETVAL}" = "2" ] && touch ${LOCKFILE} && log_warning_msg - [ "${RETVAL}" = "0" ] && touch ${LOCKFILE} && log_success_msg + echo -n $"Starting ${MODULE_NAME} drivers: " + load_ipmi_modules > /dev/null 2>&1 + [ "${RETVAL}" = "1" ] && log_failure_msg && return + [ "${RETVAL}" = "2" ] && touch ${LOCKFILE} && log_warning_msg + [ "${RETVAL}" = "0" ] && touch ${LOCKFILE} && log_success_msg } ############################################################################# stop() { - echo -n $"Stopping ${MODULE_NAME} drivers: " - unload_ipmi_modules_leave_features - rm -f ${LOCKFILE} - log_success_msg + echo -n $"Stopping ${MODULE_NAME} drivers: " + unload_ipmi_modules_leave_features + rm -f ${LOCKFILE} + log_success_msg } stop_all() { - echo -n $"Stopping ${MODULE_NAME} drivers: " - unload_all_ipmi_modules - rm -f ${LOCKFILE} - log_success_msg + echo -n $"Stopping all ${MODULE_NAME} drivers: " + unload_all_ipmi_modules + rm -f ${LOCKFILE} + log_success_msg } ############################################################################# restart() { - stop_all - start + stop_all + start } ############################################################################# -status () + +modules_loaded() +{ + OnePlusLoaded=0 + OnePlusUnloaded=0 + for m in $@; do + if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then + echo "$m module loaded." + OnePlusLoaded=1 + else + echo "$m module not loaded." + OnePlusUnLoaded=1 + fi + done +} + +device_node_exists() +{ + if [ -e "$1" ]; then + echo "$1 exists." + return 1 + fi + echo "$1 does not exist." + return 0 +} + +minimum_modules_loaded() +{ + modules_loaded ${MODULES_BASE} + [ ${OnePlusLoaded} -eq 0 ] && return 0 + + modules_loaded ${MODULES_HW} + [ ${OnePlusLoaded} -eq 0 ] && return 0 + + return 1 +} + +# Status return code bits +# bit 0 set = minimum modules aren't loaded +# bit 1 set = requested module isn't loaded +# bit 2 set = /dev/ipmi0 doesn't exist +# bit 3 set = /dev/watchdog doesn't exist +# bit 4 set = lockfile doesn't exist + +status_all() +{ + RETVAL=0 + modules_loaded ${MODULES} + [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2)) + + device_node_exists /dev/ipmi${INTF_NUM} + [ $? -eq 0 ] && RETVAL=$((RETVAL | 4)) + + device_node_exists /dev/watchdog + [ $? -eq 0 ] && RETVAL=$((RETVAL | 8)) + + [ ! -e ${LOCKFILE} ] && RETVAL=$((RETVAL | 16)) +} + +status() +{ + RETVAL=0 + minimum_modules_loaded + [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) + + modules_loaded ipmi_devintf + [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) + + device_node_exists /dev/ipmi${INTF_NUM} + [ $? -eq 0 ] && RETVAL=$((RETVAL | 4)) +} + +status_watchdog() +{ + RETVAL=0 + minimum_modules_loaded + [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) + + modules_loaded ipmi_watchdog + [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) + + device_node_exists /dev/watchdog + [ $? -eq 0 ] && RETVAL=$((RETVAL | 8)) +} + +status_powercontrol() { - for m in ${MODULES}; do - if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then - echo "$m module loaded" - else - echo "$m module not loaded" - fi - done + RETVAL=0 + minimum_modules_loaded + [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) + + modules_loaded ipmi_powercontrol + [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) } +############################################################################# usage () { - echo $"Usage: $0 {start|stop|status|restart|condrestart|" 1>&2 - echo $" start-watchdog|stop-watchdog|" 1>&2 - echo $" start-powercontrol|stop-powercontrol|" 1>&2 - echo $" stop-all}" 1>&2 - RETVAL=1 + echo $"Usage: $0 {start|stop|status|restart|condrestart|" 1>&2 + echo $" start-watchdog|stop-watchdog|status-watchdog" 1>&2 + echo $" start-powercontrol|stop-powercontrol|status-powercontrol" 1>&2 + echo $" stop-all|status-all}" 1>&2 + RETVAL=1 } condrestart () { - [ -e ${LOCKFILE} ] && restart + [ -e ${LOCKFILE} ] && restart } ############################################################################# @@ -231,12 +326,15 @@ stop) stop ;; restart) restart ;; status) status ;; + status-all) status_all ;; condrestart) condrestart ;; start-watchdog) start_watchdog ;; stop-watchdog) stop_watchdog ;; + status-watchdog) status_watchdog ;; start-powercontrol) start_powercontrol ;; stop-powercontrol) stop_powercontrol ;; - stop-all) stop_all ;; + status-powercontrol) status_powercontrol ;; + stop-all) stop_all ;; *) usage ;; esac From fedora-cvs-commits at redhat.com Thu Sep 1 17:05:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 13:05:49 -0400 Subject: rpms/kernel/FC-3 kernel-2.6.spec,1.873.2.2,1.873.2.3 Message-ID: <200509011705.j81H5nv1021341@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv21310 Modified Files: Tag: private-linville-fc3-jwltest-22-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v retrieving revision 1.873.2.2 retrieving revision 1.873.2.3 diff -u -r1.873.2.2 -r1.873.2.3 --- kernel-2.6.spec 31 Aug 2005 20:44:16 -0000 1.873.2.2 +++ kernel-2.6.spec 1 Sep 2005 17:05:46 -0000 1.873.2.3 @@ -147,7 +147,7 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries ppc +ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Thu Sep 1 17:36:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 13:36:59 -0400 Subject: rpms/lm_sensors/devel lm_sensors.spec,1.27,1.28 Message-ID: <200509011736.j81Hax2Y008504@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/lm_sensors/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8390 Modified Files: lm_sensors.spec Log Message: - Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage (#166673) - Fixed missing optflags during build (#166910) Index: lm_sensors.spec =================================================================== RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- lm_sensors.spec 23 May 2005 16:02:21 -0000 1.27 +++ lm_sensors.spec 1 Sep 2005 17:36:56 -0000 1.28 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 2.9.1 -Release: 3 +Release: 4 URL: http://secure.netroedge.com/~lm78/ Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz Source1: lm_sensors.sysconfig @@ -13,6 +13,7 @@ Patch6: lm_sensors-2.8.3-rpath.patch Patch7: lm_sensors-2.8.7-udev.patch Patch8: lm_sensors-2.9.1-kernel26.patch +Patch9: lm_sensors-2.9.1-pwconfig.patch Summary: Hardware monitoring tools. Group: Applications/System License: GPL @@ -45,10 +46,12 @@ %patch6 -p1 -b .rpath %patch7 -p1 -b .udev %patch8 -p1 -b .kernel26 +%patch9 -p1 -b .pwconfig %build mkdir -p kernel/include/linux ln -sf /usr/include/linux/* kernel/include/linux +export CFLAGS="%{optflags}" make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=%{_libdir} libexecdir=/usr/libexec localstatedir=/var sharedstatedir=/usr/com mandir=/usr/share/man infodir=/usr/share/info user %install @@ -99,6 +102,11 @@ %{_libdir}/lib*.so %changelog +* Tue Sep 01 2005 Phil Knirsch 2.9.1-4 +- Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage + (#166673) +- Fixed missing optflags during build (#166910) + * Mon May 23 2005 Phil Knirsch 2.9.1-3 - Update to lm_sensors-2.9.1 - Fixed wrong/missing location variables for make user From fedora-cvs-commits at redhat.com Thu Sep 1 17:37:18 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 13:37:18 -0400 Subject: rpms/lm_sensors/devel lm_sensors-2.9.1-pwconfig.patch,NONE,1.1 Message-ID: <200509011737.j81HbIDo008678@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/lm_sensors/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8601 Added Files: lm_sensors-2.9.1-pwconfig.patch Log Message: - Added new patch file. lm_sensors-2.9.1-pwconfig.patch: pwmconfig | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE lm_sensors-2.9.1-pwconfig.patch --- --- lm_sensors-2.9.1/prog/pwm/pwmconfig.pwconfig 2005-03-15 20:24:25.000000000 +0100 +++ lm_sensors-2.9.1/prog/pwm/pwmconfig 2005-08-30 14:21:37.000000000 +0200 @@ -465,9 +465,11 @@ function SaveConfig { echo echo "Saving configuration to $FCCONFIG..." - egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >/tmp/fancontrol - echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>/tmp/fancontrol - mv /tmp/fancontrol $FCCONFIG + tmpfile=`tempfile` || { echo "$0: Cannot create temporary file" >&2; exit 1; } + trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 + egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >$tmpfile + echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile + mv $tmpfile $FCCONFIG #check if file was written correctly echo 'Configuration saved' } From fedora-cvs-commits at redhat.com Thu Sep 1 17:42:13 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 13:42:13 -0400 Subject: rpms/lm_sensors/FC-4 lm_sensors-2.9.1-pwconfig.patch, NONE, 1.1 lm_sensors.spec, 1.27, 1.28 Message-ID: <200509011742.j81HgDPp011078@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/lm_sensors/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv10974 Modified Files: lm_sensors.spec Added Files: lm_sensors-2.9.1-pwconfig.patch Log Message: - Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage (#166673) - Fixed missing optflags during build (#166910) lm_sensors-2.9.1-pwconfig.patch: pwmconfig | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE lm_sensors-2.9.1-pwconfig.patch --- --- lm_sensors-2.9.1/prog/pwm/pwmconfig.pwconfig 2005-03-15 20:24:25.000000000 +0100 +++ lm_sensors-2.9.1/prog/pwm/pwmconfig 2005-08-30 14:21:37.000000000 +0200 @@ -465,9 +465,11 @@ function SaveConfig { echo echo "Saving configuration to $FCCONFIG..." - egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >/tmp/fancontrol - echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>/tmp/fancontrol - mv /tmp/fancontrol $FCCONFIG + tmpfile=`tempfile` || { echo "$0: Cannot create temporary file" >&2; exit 1; } + trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 + egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >$tmpfile + echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile + mv $tmpfile $FCCONFIG #check if file was written correctly echo 'Configuration saved' } Index: lm_sensors.spec =================================================================== RCS file: /cvs/dist/rpms/lm_sensors/FC-4/lm_sensors.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- lm_sensors.spec 23 May 2005 16:02:21 -0000 1.27 +++ lm_sensors.spec 1 Sep 2005 17:42:11 -0000 1.28 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 2.9.1 -Release: 3 +Release: 3.FC4.1 URL: http://secure.netroedge.com/~lm78/ Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz Source1: lm_sensors.sysconfig @@ -13,6 +13,7 @@ Patch6: lm_sensors-2.8.3-rpath.patch Patch7: lm_sensors-2.8.7-udev.patch Patch8: lm_sensors-2.9.1-kernel26.patch +Patch9: lm_sensors-2.9.1-pwconfig.patch Summary: Hardware monitoring tools. Group: Applications/System License: GPL @@ -45,10 +46,12 @@ %patch6 -p1 -b .rpath %patch7 -p1 -b .udev %patch8 -p1 -b .kernel26 +%patch9 -p1 -b .pwconfig %build mkdir -p kernel/include/linux ln -sf /usr/include/linux/* kernel/include/linux +export CFLAGS="%{optflags}" make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=%{_libdir} libexecdir=/usr/libexec localstatedir=/var sharedstatedir=/usr/com mandir=/usr/share/man infodir=/usr/share/info user %install @@ -99,6 +102,11 @@ %{_libdir}/lib*.so %changelog +* Tue Sep 01 2005 Phil Knirsch 2.9.1-3.FC4.1 +- Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage + (#166673) +- Fixed missing optflags during build (#166910) + * Mon May 23 2005 Phil Knirsch 2.9.1-3 - Update to lm_sensors-2.9.1 - Fixed wrong/missing location variables for make user From fedora-cvs-commits at redhat.com Thu Sep 1 17:44:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 13:44:29 -0400 Subject: rpms/lm_sensors/FC-3 lm_sensors-2.8.7-pwconfig.patch, NONE, 1.1 lm_sensors.spec, 1.17, 1.18 Message-ID: <200509011744.j81HiTGI004581@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/lm_sensors/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv4557 Modified Files: lm_sensors.spec Added Files: lm_sensors-2.8.7-pwconfig.patch Log Message: - Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage (#166673) - Fixed missing optflags during build (#166910) - Fixed wrong/missing location variables for make user - Added Buildprereq for bison (#138888) lm_sensors-2.8.7-pwconfig.patch: pwmconfig | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE lm_sensors-2.8.7-pwconfig.patch --- --- lm_sensors-2.9.1/prog/pwm/pwmconfig.pwconfig 2005-03-15 20:24:25.000000000 +0100 +++ lm_sensors-2.9.1/prog/pwm/pwmconfig 2005-08-30 14:21:37.000000000 +0200 @@ -465,9 +465,11 @@ function SaveConfig { echo echo "Saving configuration to $FCCONFIG..." - egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' /etc/fancontrol >/tmp/fancontrol - echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>/tmp/fancontrol - mv /tmp/fancontrol /etc/fancontrol + tmpfile=`tempfile` || { echo "$0: Cannot create temporary file" >&2; exit 1; } + trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 + egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >$tmpfile + echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile + mv $tmpfile $FCCONFIG #check if file was written correctly echo 'Configuration saved' } Index: lm_sensors.spec =================================================================== RCS file: /cvs/dist/rpms/lm_sensors/FC-3/lm_sensors.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lm_sensors.spec 14 Oct 2004 14:05:56 -0000 1.17 +++ lm_sensors.spec 1 Sep 2005 17:44:27 -0000 1.18 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 2.8.7 -Release: 2 +Release: 2.FC3.1 URL: http://secure.netroedge.com/~lm78/ Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz Source1: lm_sensors.sysconfig @@ -12,12 +12,13 @@ Patch5: lm_sensors-2.8.3-local.patch Patch6: lm_sensors-2.8.3-rpath.patch Patch7: lm_sensors-2.8.7-udev.patch +Patch8: lm_sensors-2.8.7-pwconfig.patch Summary: Hardware monitoring tools. Group: Applications/System License: GPL Buildroot: %{_tmppath}/%{name}-root Requires: kernel-utils -BuildPrereq: kernel-headers >= 2.2.16 +BuildPrereq: kernel-headers >= 2.2.16, bison ExclusiveArch: alpha %{ix86} x86_64 %description @@ -43,11 +44,13 @@ %patch5 -p1 -b .local %patch6 -p1 -b .rpath %patch7 -p1 -b .udev +%patch8 -p1 -b .pwconfig %build mkdir -p kernel/include/linux ln -sf /usr/include/linux/* kernel/include/linux -make user +export CFLAGS="%{optflags}" +make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=%{_libdir} libexecdir=/usr/libexec localstatedir=/var sharedstatedir=/usr/com mandir=/usr/share/man infodir=/usr/share/info user %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT @@ -99,6 +102,11 @@ %{_libdir}/lib*.so %changelog +* Tue Aug 30 2005 Phil Knirsch 2.8.7-2.FC3.1 +- Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage + (#166673) +- Fixed missing optflags during build (#166910) + * Thu Oct 14 2004 Harald Hoyer 2.8.7-2 - added initial /etc/sysconfig/lm_sensors - added initscript From fedora-cvs-commits at redhat.com Thu Sep 1 18:32:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 1 Sep 2005 14:32:14 -0400 Subject: rpms/kernel/FC-4 jwltest-3c59x-resume-debug.patch, NONE, 1.1.12.1 jwltest-3c59x-resume.patch, NONE, 1.1.14.1 jwltest-acpi-dsdt-initrd.patch, NONE, 1.1.20.1 jwltest-b44-link-check.patch, NONE, 1.1.22.1 jwltest-ipw2100-1_1_0.patch, NONE, 1.1.24.1 jwltest-libata-atapi.patch, NONE, 1.1.4.1 jwltest-pci-d3hot-d0.patch, NONE, 1.1.10.1 jwltest-sundance-icplus.patch, NONE, 1.1.4.1 Message-ID: <200509011832.j81IWETu008331@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv8249 Added Files: Tag: private-linville-fc4-jwltest-16-branch jwltest-3c59x-resume-debug.patch jwltest-3c59x-resume.patch jwltest-acpi-dsdt-initrd.patch jwltest-b44-link-check.patch jwltest-ipw2100-1_1_0.patch jwltest-libata-atapi.patch jwltest-pci-d3hot-d0.patch jwltest-sundance-icplus.patch Log Message: jwltest-3c59x-resume-debug.patch: 3c59x.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+) --- NEW FILE jwltest-3c59x-resume-debug.patch --- --- linux-2.6.12/drivers/net/3c59x.c.orig 2005-07-05 14:31:33.215024067 -0400 +++ linux-2.6.12/drivers/net/3c59x.c 2005-07-05 14:31:20.407728199 -0400 @@ -979,6 +979,20 @@ static int vortex_suspend (struct pci_de static int vortex_resume (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); + int pm; + u16 pmcsr; + + pm = pci_find_capability(pdev, PCI_CAP_ID_PM); + if (pm) { + u16 state; + + printk (KERN_ERR PFX "Entering %s\n", __FUNCTION__); + pci_read_config_word(pdev, pm + PCI_PM_CTRL, &pmcsr); + state = pmcsr & PCI_PM_CTRL_STATE_MASK; + printk (KERN_ERR PFX "pdev->current_state %d\n", + pdev->current_state); + printk (KERN_ERR PFX "pmcsr state %d\n", state); + } if (dev && dev->priv) { if (netif_running(dev)) { @@ -986,6 +1000,18 @@ static int vortex_resume (struct pci_dev netif_device_attach(dev); } } + + if (pm) { + u16 state; + + printk (KERN_ERR PFX "Exiting %s\n", __FUNCTION__); + pci_read_config_word(pdev, pm + PCI_PM_CTRL, &pmcsr); + state = pmcsr & PCI_PM_CTRL_STATE_MASK; + printk (KERN_ERR PFX "pdev->current_state %d\n", + pdev->current_state); + printk (KERN_ERR PFX "pmcsr state %d\n", state); + } + return 0; } @@ -1576,9 +1602,27 @@ vortex_up(struct net_device *dev) struct vortex_private *vp = netdev_priv(dev); unsigned int config; int i; + int pm; + u16 pmcsr; if (VORTEX_PCI(vp)) { + printk (KERN_ERR PFX "Calling pci_enable_device\n"); pci_enable_device(VORTEX_PCI(vp)); + + pm = pci_find_capability(VORTEX_PCI(vp), PCI_CAP_ID_PM); + if (pm) { + u16 state; + + pci_read_config_word(VORTEX_PCI(vp), pm + PCI_PM_CTRL, + &pmcsr); + state = pmcsr & PCI_PM_CTRL_STATE_MASK; + printk (KERN_ERR PFX + "VORTEX_PCI(vp)->current_state %d\n", + VORTEX_PCI(vp)->current_state); + printk (KERN_ERR PFX "pmcsr state %d\n", state); + } + + printk (KERN_ERR PFX "Calling pci_restore_state\n"); pci_restore_state(VORTEX_PCI(vp)); } jwltest-3c59x-resume.patch: 3c59x.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) --- NEW FILE jwltest-3c59x-resume.patch --- --- linux-2.6.12/drivers/net/3c59x.c.orig 2005-07-01 17:04:31.254440604 -0400 +++ linux-2.6.12/drivers/net/3c59x.c 2005-07-01 17:26:11.163398335 -0400 @@ -795,7 +795,6 @@ struct vortex_private { partner_flow_ctrl:1, /* Partner supports flow control */ has_nway:1, enable_wol:1, /* Wake-on-LAN is enabled */ - pm_state_valid:1, /* pci_dev->saved_config_space has sane contents */ open:1, medialock:1, must_free_region:1, /* Flag: if zero, Cardbus owns the I/O region */ @@ -1523,7 +1522,6 @@ static int __devinit vortex_probe1(struc dev->poll_controller = poll_vortex; #endif if (pdev) { - vp->pm_state_valid = 1; pci_save_state(VORTEX_PCI(vp)); acpi_set_WOL(dev); } @@ -1580,10 +1578,8 @@ vortex_up(struct net_device *dev) int i; if (VORTEX_PCI(vp)) { - pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ - if (vp->pm_state_valid) - pci_restore_state(VORTEX_PCI(vp)); pci_enable_device(VORTEX_PCI(vp)); + pci_restore_state(VORTEX_PCI(vp)); } /* Before initializing select the active media port. */ @@ -2742,7 +2738,6 @@ vortex_down(struct net_device *dev, int outl(0, ioaddr + DownListPtr); if (final_down && VORTEX_PCI(vp)) { - vp->pm_state_valid = 1; pci_save_state(VORTEX_PCI(vp)); acpi_set_WOL(dev); } @@ -3051,7 +3046,7 @@ static int vortex_ioctl(struct net_devic /* The kernel core really should have pci_get_power_state() */ if(state != 0) - pci_set_power_state(VORTEX_PCI(vp), PCI_D0); + pci_enable_device(VORTEX_PCI(vp)); spin_lock_irqsave(&vp->lock, flags); EL3WINDOW(4); err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL); @@ -3271,9 +3266,8 @@ static void __devexit vortex_remove_one unregister_netdev(dev); if (VORTEX_PCI(vp)) { - pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ - if (vp->pm_state_valid) - pci_restore_state(VORTEX_PCI(vp)); + pci_enable_device(VORTEX_PCI(vp)); /* necessary */ + pci_restore_state(VORTEX_PCI(vp)); pci_disable_device(VORTEX_PCI(vp)); } /* Should really use issue_and_wait() here */ jwltest-acpi-dsdt-initrd.patch: drivers/acpi/Kconfig | 13 ++++ drivers/acpi/osl.c | 115 +++++++++++++++++++++++++++++++++++++------- drivers/acpi/tables/tbget.c | 8 ++- init/main.c | 16 +++--- 4 files changed, 126 insertions(+), 26 deletions(-) --- NEW FILE jwltest-acpi-dsdt-initrd.patch --- --- linux-2.6.12/drivers/acpi/Kconfig.orig 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/drivers/acpi/Kconfig 2005-06-22 12:23:14.467811177 -0400 @@ -352,4 +352,17 @@ config ACPI_HOTPLUG_MEMORY $>modprobe acpi_memhotplug endif # ACPI +config ACPI_INITRD + bool "Read DSDT from initrd or initramfs" + depends on ACPI && BLK_DEV_INITRD && !ACPI_CUSTOM_DSDT + default n + help + The DSDT (Differentiated System Description Table) often needs to be + overridden because of broken BIOS implementations. If you want to use + a customized DSDT, please use the mkinitrd tool (mkinitrd package) to + attach the DSDT to the initrd or initramfs + (see http://gaugusch.at/kernel.shtml for details) + If there is no DSDT found in the initrd, the DSDT from the BIOS is + used. It is save to say yes here. + endmenu --- linux-2.6.12/drivers/acpi/osl.c.orig 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/drivers/acpi/osl.c 2005-06-22 12:23:14.469810910 -0400 @@ -44,7 +44,10 @@ #include #include - +#ifdef CONFIG_ACPI_INITRD +#include +#include +#endif #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME ("osl") @@ -246,25 +249,105 @@ acpi_os_predefined_override (const struc return AE_OK; } -acpi_status -acpi_os_table_override (struct acpi_table_header *existing_table, - struct acpi_table_header **new_table) -{ - if (!existing_table || !new_table) - return AE_BAD_PARAMETER; +#ifdef CONFIG_ACPI_INITRD +static char * +acpi_find_dsdt_initrd(void) +{ + static const char signature[] = "INITRDDSDT123DSDT123"; + char *dsdt_start = NULL; + char *dsdt_buffer = NULL; + unsigned long len = 0, len2 = 0; + int fd; + char ramfs_dsdt_name[10] = "/DSDT.aml"; + struct kstat stat; + + /* try to get dsdt from tail of initrd */ + if ((fd = sys_open(ramfs_dsdt_name, O_RDONLY, 0)) < 0) { + if (initrd_start) { + char *data = (char *)initrd_start; + + printk(KERN_INFO PREFIX "Looking for DSDT in initrd..."); + + /* Search for the start signature */ + while (data < (char *)initrd_end - sizeof(signature) - 4) { + if (!memcmp(data, signature, sizeof(signature))) { + data += sizeof(signature); + if (!memcmp(data, "DSDT", 4)) + dsdt_start = data; + break; + } + data++; + } -#ifdef CONFIG_ACPI_CUSTOM_DSDT - if (strncmp(existing_table->signature, "DSDT", 4) == 0) - *new_table = (struct acpi_table_header*)AmlCode; - else + if (dsdt_start){ + printk(PREFIX " found at offset %zu", + dsdt_start - (char *)initrd_start); + len = (char*) initrd_end - dsdt_start; + printk(", size: %lu bytes\n", len); + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + memcpy(dsdt_buffer, dsdt_start, len); + *(dsdt_buffer + len + 1)= '\0'; + } + else + printk(" not found!\n"); + } + } + /* get dsdt from initramfs */ + else{ + printk(KERN_INFO PREFIX "Looking for DSDT in initramfs..."); + if (vfs_stat(ramfs_dsdt_name, &stat) < 0){ + printk ("error getting stats for file %s\n", ramfs_dsdt_name); + return NULL; + } + + len = stat.size; + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + if (!dsdt_buffer) { + printk("Could not allocate %lu bytes of memory\n", len); + return NULL; + } + printk (" found %s ...", ramfs_dsdt_name); + + len2 = sys_read (fd, (char __user *) dsdt_buffer, len); + if (len2 < len ){ + printk(PREFIX "\nError trying to read %lu bytes from %s\n", + len, ramfs_dsdt_name); + ACPI_MEM_FREE (dsdt_buffer); + dsdt_buffer = NULL; + } + else{ + printk(" successfully read %lu bytes from %s\n", + len, ramfs_dsdt_name); + *(dsdt_buffer + len + 1) = '\0'; + } + } + if (!dsdt_buffer) + printk(" not found!\n"); + return dsdt_buffer; +} +#endif + +acpi_status + acpi_os_table_override (struct acpi_table_header *existing_table, + struct acpi_table_header **new_table) + { + if (!existing_table || !new_table) + return AE_BAD_PARAMETER; + *new_table = NULL; -#else - *new_table = NULL; + if (strncmp(existing_table->signature, "DSDT", 4) == 0) { +#ifdef CONFIG_ACPI_CUSTOM_DSDT + *new_table = (struct acpi_table_header*)AmlCode; +#elif defined(CONFIG_ACPI_INITRD) + *new_table = (struct acpi_table_header*)acpi_find_dsdt_initrd(); #endif + if (*new_table) + printk(KERN_INFO PREFIX "Using customized DSDT\n"); + } return AE_OK; -} - -static irqreturn_t + } + + static irqreturn_t acpi_irq(int irq, void *dev_id, struct pt_regs *regs) { return (*acpi_irq_handler)(acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE; --- linux-2.6.12/drivers/acpi/tables/tbget.c.orig 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/drivers/acpi/tables/tbget.c 2005-06-22 12:23:14.471810644 -0400 @@ -45,7 +45,6 @@ #include #include - #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbget") @@ -287,12 +286,17 @@ acpi_tb_table_override ( acpi_format_exception (status))); return_ACPI_STATUS (status); } - + /* Copy the table info */ ACPI_REPORT_INFO (("Table [%4.4s] replaced by host OS\n", table_info->pointer->signature)); +#ifdef CONFIG_ACPI_INITRD + if (new_table) + ACPI_MEM_FREE(new_table); +#endif + return_ACPI_STATUS (AE_OK); } --- linux-2.6.12/init/main.c.orig 2005-06-22 12:16:17.014413511 -0400 +++ linux-2.6.12/init/main.c 2005-06-22 12:23:14.473810378 -0400 @@ -520,8 +520,6 @@ asmlinkage void __init start_kernel(void check_bugs(); - acpi_early_init(); /* before LAPIC and SMP init */ - /* Do the rest non-__init'ed, we're now alive */ rest_init(); } @@ -651,6 +649,14 @@ static int init(void * unused) */ child_reaper = current; + /* + * Do this before initcalls, because some drivers want to access + * firmware files. + */ + populate_rootfs(); + + acpi_early_init(); /* before LAPIC and SMP init */ + /* Sets up cpus_possible() */ smp_prepare_cpus(max_cpus); @@ -661,12 +667,6 @@ static int init(void * unused) cpuset_init_smp(); - /* - * Do this before initcalls, because some drivers want to access - * firmware files. - */ - populate_rootfs(); - do_basic_setup(); sched_init_smp(); jwltest-b44-link-check.patch: b44.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE jwltest-b44-link-check.patch --- --- linux-2.6.11/drivers/net/b44.c.orig 2005-06-07 09:51:48.349772547 -0400 +++ linux-2.6.11/drivers/net/b44.c 2005-06-07 09:55:19.579618942 -0400 @@ -1286,6 +1286,9 @@ b44_init_hw(bp); bp->flags |= B44_FLAG_INIT_COMPLETE; + netif_carrier_off(dev); + b44_check_phy(bp); + spin_unlock_irq(&bp->lock); init_timer(&bp->timer); jwltest-ipw2100-1_1_0.patch: Documentation/networking/README.ipw2100 | 162 drivers/net/wireless/Kconfig | 55 drivers/net/wireless/Makefile | 4 drivers/net/wireless/ieee80211/ieee80211.h | 85 drivers/net/wireless/ieee80211/ieee80211_crypt.c | 4 drivers/net/wireless/ieee80211/ieee80211_crypt.h | 6 drivers/net/wireless/ieee80211/ieee80211_crypt_ccmp.c | 3 drivers/net/wireless/ieee80211/ieee80211_crypt_tkip.c | 3 drivers/net/wireless/ieee80211/ieee80211_crypt_wep.c | 4 drivers/net/wireless/ieee80211/ieee80211_module.c | 50 drivers/net/wireless/ieee80211/ieee80211_rx.c | 226 drivers/net/wireless/ieee80211/ieee80211_tx.c | 113 drivers/net/wireless/ieee80211/ieee80211_wx.c | 148 drivers/net/wireless/ipw2100.c | 8649 +++++++++++++++++ drivers/net/wireless/ipw2100.h | 1278 ++ drivers/net/wireless/ipw2100/LICENSE | 339 drivers/net/wireless/ipw2100/Makefile | 15 drivers/net/wireless/ipw2100/ipw2100.c | 8972 ------------------ drivers/net/wireless/ipw2100/ipw2100.h | 1287 -- 19 files changed, 10409 insertions(+), 10994 deletions(-) --- NEW FILE jwltest-ipw2100-1_1_0.patch --- --- linux-2.6.12/Documentation/networking/README.ipw2100.orig 2005-06-22 13:38:36.756298804 -0400 +++ linux-2.6.12/Documentation/networking/README.ipw2100 2005-06-22 13:39:36.938279261 -0400 @@ -1,32 +1,59 @@ -Intel PRO/Wireless 2100 802.11b Driver for Linux +=========================== +Intel(R) PRO/Wireless 2100 Network Connection Driver for Linux README.ipw2100 -October 13, 2004 +March 14, 2005 +=========================== +Index +--------------------------- +0. Introduction +1. Release 1.1.0 Current Features +2. Command Line Parameters +3. Sysfs Helper Files +4. Radio Kill Switch +5. Dynamic Firmware +6. Power Management +7. Support +8. License -Release 0.56 Current Features + +=========================== +0. Introduction ------------ ----- ----- ---- --- -- - -- IBSS and BSS modes -- 802.11 fragmentation +This document provides a brief overview of the features supported by the +IPW2100 driver project. The main project website, where the latest +development version of the driver can be found, is: + + http://ipw2100.sourceforge.net + +There you can find the not only the latest releases, but also information about +potential fixes and patches, as well as links to the development mailing list +for the driver project. + + +=========================== +1. Release 1.1.0 Current Supported Features +--------------------------- +- Managed (BSS) and Ad-Hoc (IBSS) - WEP (shared key and open) -- wireless extension support -- 802.1x EAP via xsupplicant +- Wireless Tools support +- 802.1x (tested with XSupplicant 1.0.1) + +Enabled (but not supported) features: - Monitor/RFMon mode -- transmit power control -- long/short preamble support -- power states support (ACPI) +- WPA/WPA2 -TODO ------------- ----- ----- ---- --- -- - -- Fix bugs... The biggies: - C3 corruption - Fragmentation +The distinction between officially supported and enabled is a reflection +on the amount of validation and interoperability testing that has been +performed on a given feature. -Command Line Parameters ------------- ----- ----- ---- --- -- - +=========================== +2. Command Line Parameters +--------------------------- If the driver is built as a module, the following optional parameters are used by entering them on the command line with the modprobe command using this @@ -34,54 +61,82 @@ syntax: modprobe ipw2100 [