openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2006
- 2 participants
- 1318 discussions
Hello community,
here is the log from the commit of package contact-lookup-applet
checked in at Fri Sep 1 01:25:03 CEST 2006.
--------
--- GNOME/contact-lookup-applet/contact-lookup-applet.changes 2006-01-25 21:31:20.000000000 +0100
+++ contact-lookup-applet/contact-lookup-applet.changes 2006-08-31 18:24:00.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 18:23:41 CEST 2006 - gekker(a)suse.de
+
+- remove unneeded gal2-devel from BuildRequires
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ contact-lookup-applet.spec ++++++
--- /var/tmp/diff_new_pack.YUOs4h/_old 2006-09-01 01:24:06.000000000 +0200
+++ /var/tmp/diff_new_pack.YUOs4h/_new 2006-09-01 01:24:06.000000000 +0200
@@ -1,17 +1,17 @@
#
# spec file for package contact-lookup-applet (Version 0.13)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: contact-lookup-applet
-BuildRequires: evolution-data-server-devel gal2-devel gnome-panel-devel libwnck-devel mDNSResponder-devel mozilla-nss-devel update-desktop-files
+BuildRequires: evolution-data-server-devel gnome-panel-devel libwnck-devel mDNSResponder-devel mozilla-nss-devel update-desktop-files
Requires: gnome-utils
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
@@ -19,8 +19,8 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 0.13
-Release: 6
-Summary: Evolution Addressbook Search Applet
+Release: 22
+Summary: Evolution Address Book Search Applet
Source: %{name}-%{version}.tar.gz
Patch7: c-l-a-configure.diff
URL: http://www.gnome.org
@@ -31,7 +31,7 @@
book.
To use, simply add it to your panel (Add to Panel -> Accessories ->
-Address book Lookup), type a name into the field, and hit [return] or
+Address book Lookup), type a name into the field, and hit [Enter] or
Search.
@@ -83,6 +83,8 @@
%prefix/%_lib/contact-lookup-applet
%changelog -n contact-lookup-applet
+* Thu Aug 31 2006 - gekker(a)suse.de
+- remove unneeded gal2-devel from BuildRequires
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Fri Sep 16 2005 - sbrabec(a)suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bluez-libs
checked in at Fri Sep 1 01:24:00 CEST 2006.
--------
--- bluez-libs/bluez-libs.changes 2006-07-31 19:25:31.000000000 +0200
+++ bluez-libs/bluez-libs.changes 2006-08-31 11:56:42.000000000 +0200
@@ -1,0 +2,16 @@
+Wed Aug 30 08:30:28 CEST 2006 - dgollub(a)suse.de
+
+- update to v3.4
+ * Fix UUID128 string lookup handling
+ * Fix malloc() versus bt_malloc() usage.
+
+- update to v3.3
+ * Remove kernel specific timeouts.
+ * Add additional private data field for SDP sessions.
+ * Add host number of completed packets defines.
+ * Initialize various memory to zero before usage.
+
+- moved libtoolize and autoreconf in build section
+- replace libtoolize with autoreconf -sfi
+
+-------------------------------------------------------------------
Old:
----
bluez-libs-3.2.tar.gz
New:
----
bluez-libs-3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-libs.spec ++++++
--- /var/tmp/diff_new_pack.P2lKty/_old 2006-09-01 01:23:40.000000000 +0200
+++ /var/tmp/diff_new_pack.P2lKty/_new 2006-09-01 01:23:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package bluez-libs (Version 3.2)
+# spec file for package bluez-libs (Version 3.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: bluez-libs
URL: http://bluez.sourceforge.net
-Version: 3.2
+Version: 3.4
Release: 1
Summary: Bluetooth Libraries
License: GPL
@@ -36,10 +36,9 @@
%prep
%setup -q
%{?suse_update_config:%{suse_update_config -f . }}
-libtoolize --force
-autoreconf -f
%build
+autoreconf -sfi
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --libdir=%_libdir --localstatedir=%_localstatedir
make
@@ -65,6 +64,17 @@
%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
%changelog -n bluez-libs
+* Wed Aug 30 2006 - dgollub(a)suse.de
+- update to v3.4
+ * Fix UUID128 string lookup handling
+ * Fix malloc() versus bt_malloc() usage.
+- update to v3.3
+ * Remove kernel specific timeouts.
+ * Add additional private data field for SDP sessions.
+ * Add host number of completed packets defines.
+ * Initialize various memory to zero before usage.
+- moved libtoolize and autoreconf in build section
+- replace libtoolize with autoreconf -sfi
* Mon Jul 31 2006 - seife(a)suse.de
- update to v3.2
* Fix handling of SDP strings.
++++++ bluez-libs-3.2.tar.gz -> bluez-libs-3.4.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/ChangeLog new/bluez-libs-3.4/ChangeLog
--- old/bluez-libs-3.2/ChangeLog 2006-07-27 06:36:59.000000000 +0200
+++ new/bluez-libs-3.4/ChangeLog 2006-08-25 03:16:10.000000000 +0200
@@ -1,4 +1,15 @@
-ver 3.2
+ver 3.4:
+ Fix UUID128 string lookup handling.
+ Fix malloc() versus bt_malloc() usage.
+
+ver 3.3:
+ Remove kernel specific timeouts.
+ Add additional private data field for SDP sessions.
+ Add host controller to host flow control defines.
+ Add host number of completed packets defines.
+ Initialize various memory to zero before usage.
+
+ver 3.2:
Fix handling of SDP strings.
Add adapter type for SDIO cards.
Add features bit for link supervision timeout.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/configure new/bluez-libs-3.4/configure
--- old/bluez-libs-3.2/configure 2006-07-27 06:37:35.000000000 +0200
+++ new/bluez-libs-3.4/configure 2006-08-25 03:17:57.000000000 +0200
@@ -1775,7 +1775,7 @@
# Define the identity of the package.
PACKAGE=bluez-libs
- VERSION=3.2
+ VERSION=3.4
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/configure.in new/bluez-libs-3.4/configure.in
--- old/bluez-libs-3.2/configure.in 2006-07-27 06:36:59.000000000 +0200
+++ new/bluez-libs-3.4/configure.in 2006-08-25 03:16:11.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(bluez-libs, 3.2)
+AM_INIT_AUTOMAKE(bluez-libs, 3.4)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/include/hci.h new/bluez-libs-3.4/include/hci.h
--- old/bluez-libs-3.2/include/hci.h 2006-07-27 06:36:59.000000000 +0200
+++ new/bluez-libs-3.4/include/hci.h 2006-08-22 08:26:05.000000000 +0200
@@ -98,12 +98,6 @@
#define HCIINQUIRY _IOR('H', 240, int)
-/* HCI timeouts */
-
-#define HCI_CONN_TIMEOUT (HZ * 40)
-#define HCI_DISCONN_TIMEOUT (HZ * 2)
-#define HCI_CONN_IDLE_TIMEOUT (HZ * 60)
-
#ifndef __NO_HCI_DEFS
/* HCI Packet types */
@@ -822,6 +816,8 @@
} __attribute__ ((packed)) read_transmit_power_level_rp;
#define READ_TRANSMIT_POWER_LEVEL_RP_SIZE 4
+#define OCF_SET_CONTROLLER_TO_HOST_FC 0x0031
+
#define OCF_HOST_BUFFER_SIZE 0x0033
typedef struct {
uint16_t acl_mtu;
@@ -831,18 +827,25 @@
} __attribute__ ((packed)) host_buffer_size_cp;
#define HOST_BUFFER_SIZE_CP_SIZE 7
+#define OCF_HOST_NUM_COMP_PKTS 0x0035
+typedef struct {
+ uint8_t num_hndl;
+ /* variable length part */
+} __attribute__ ((packed)) host_num_comp_pkts_cp;
+#define HOST_NUM_COMP_PKTS_CP_SIZE 1
+
#define OCF_READ_LINK_SUPERVISION_TIMEOUT 0x0036
typedef struct {
uint8_t status;
uint16_t handle;
- uint16_t link_sup_to;
+ uint16_t timeout;
} __attribute__ ((packed)) read_link_supervision_timeout_rp;
#define READ_LINK_SUPERVISION_TIMEOUT_RP_SIZE 5
#define OCF_WRITE_LINK_SUPERVISION_TIMEOUT 0x0037
typedef struct {
uint16_t handle;
- uint16_t link_sup_to;
+ uint16_t timeout;
} __attribute__ ((packed)) write_link_supervision_timeout_cp;
#define WRITE_LINK_SUPERVISION_TIMEOUT_CP_SIZE 4
typedef struct {
@@ -1401,6 +1404,13 @@
} __attribute__ ((packed)) extended_inquiry_info;
#define EXTENDED_INQUIRY_INFO_SIZE 254
+#define EVT_LINK_SUPERVISION_TIMEOUT_CHANGE 0x38
+typedef struct {
+ uint16_t handle;
+ uint16_t timeout;
+} __attribute__ ((packed)) evt_link_supervision_timeout_change;
+#define EVT_LINK_SUPERVISION_TIMEOUT_SIZE 4
+
#define EVT_TESTING 0xFE
#define EVT_VENDOR 0xFF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/include/sdp.h new/bluez-libs-3.4/include/sdp.h
--- old/bluez-libs-3.2/include/sdp.h 2006-05-30 12:58:30.000000000 +0200
+++ new/bluez-libs-3.4/include/sdp.h 2006-08-22 08:26:05.000000000 +0200
@@ -374,18 +374,6 @@
#define SDP_SVC_REMOVE_RSP 0x80
/*
- * Values of the flags parameter to sdp_record_register
- */
-#define SDP_RECORD_PERSIST 0x01
-#define SDP_DEVICE_RECORD 0x02
-
-/*
- * Values of the flags parameter to sdp_connect
- */
-#define SDP_RETRY_IF_BUSY 0x01
-#define SDP_WAIT_ON_CLOSE 0x02
-
-/*
* SDP Error codes
*/
#define SDP_INVALID_VERSION 0x0001
@@ -499,17 +487,6 @@
int unitSize;
};
-/*
- * a session with an SDP server
- */
-typedef struct {
- int sock;
- int state;
- int local;
- int flags;
- uint16_t tid; // Current transaction ID
-} sdp_session_t;
-
#ifdef __cplusplus
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/include/sdp_lib.h new/bluez-libs-3.4/include/sdp_lib.h
--- old/bluez-libs-3.2/include/sdp_lib.h 2006-01-03 13:56:09.000000000 +0100
+++ new/bluez-libs-3.4/include/sdp_lib.h 2006-08-22 08:26:05.000000000 +0200
@@ -70,6 +70,30 @@
}
/*
+ * Values of the flags parameter to sdp_record_register
+ */
+#define SDP_RECORD_PERSIST 0x01
+#define SDP_DEVICE_RECORD 0x02
+
+/*
+ * Values of the flags parameter to sdp_connect
+ */
+#define SDP_RETRY_IF_BUSY 0x01
+#define SDP_WAIT_ON_CLOSE 0x02
+
+/*
+ * a session with an SDP server
+ */
+typedef struct {
+ int sock;
+ int state;
+ int local;
+ int flags;
+ uint16_t tid; // Current transaction ID
+ void *priv;
+} sdp_session_t;
+
+/*
* create an L2CAP connection to a Bluetooth device
*
* INPUT:
@@ -83,11 +107,9 @@
*/
sdp_session_t *sdp_connect(const bdaddr_t *src, const bdaddr_t *dst, uint32_t flags);
int sdp_close(sdp_session_t *session);
+int sdp_get_socket(const sdp_session_t *session);
-static inline int sdp_get_socket(const sdp_session_t *s)
-{
- return s->sock;
-}
+uint16_t sdp_gen_tid(sdp_session_t *session);
/*
* find all devices in the piconet
@@ -535,14 +557,6 @@
return sdp_get_string_attr(rec, SDP_ATTR_ICON_URL, str, len);
}
-/*
- * Generate unique transaction identifiers
- */
-static inline uint16_t sdp_gen_tid(sdp_session_t *session)
-{
- return session->tid++;
-}
-
sdp_record_t *sdp_extract_pdu(const uint8_t *pdata, int *scanned);
sdp_data_t *sdp_extract_string(uint8_t *, int *);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/src/Makefile.am new/bluez-libs-3.4/src/Makefile.am
--- old/bluez-libs-3.2/src/Makefile.am 2006-07-27 06:36:59.000000000 +0200
+++ new/bluez-libs-3.4/src/Makefile.am 2006-08-25 03:16:11.000000000 +0200
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libbluetooth.la
libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 3:0:1
+libbluetooth_la_LDFLAGS = -version-info 4:1:2
INCLUDES = -I$(top_builddir)/include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/src/Makefile.in new/bluez-libs-3.4/src/Makefile.in
--- old/bluez-libs-3.2/src/Makefile.in 2006-07-27 06:37:33.000000000 +0200
+++ new/bluez-libs-3.4/src/Makefile.in 2006-08-25 03:17:56.000000000 +0200
@@ -165,7 +165,7 @@
target_alias = @target_alias@
lib_LTLIBRARIES = libbluetooth.la
libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 3:0:1
+libbluetooth_la_LDFLAGS = -version-info 4:1:2
INCLUDES = -I$(top_builddir)/include
MAINTAINERCLEANFILES = Makefile.in
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/src/hci.c new/bluez-libs-3.4/src/hci.c
--- old/bluez-libs-3.2/src/hci.c 2006-07-27 06:36:59.000000000 +0200
+++ new/bluez-libs-3.4/src/hci.c 2006-08-25 03:16:11.000000000 +0200
@@ -94,7 +94,7 @@
static char *hci_uint2str(hci_map *m, unsigned int val)
{
- char *str = bt_malloc(50);
+ char *str = malloc(50);
char *ptr = str;
if (!str)
@@ -174,7 +174,7 @@
char *hci_dflagstostr(uint32_t flags)
{
- char *str = malloc(50);
+ char *str = bt_malloc(50);
char *ptr = str;
hci_map *m = dev_flags_map;
@@ -283,7 +283,7 @@
char *hci_lmtostr(unsigned int lm)
{
- char *s, *str = malloc(50);
+ char *s, *str = bt_malloc(50);
if (!str)
return NULL;
@@ -293,7 +293,7 @@
s = hci_bit2str(link_mode_map, lm);
if (!s) {
- free(str);
+ bt_free(str);
return NULL;
}
@@ -680,6 +680,8 @@
goto done;
}
+ memset(dl, 0, HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl));
+
dl->dev_num = HCI_MAX_DEV;
dr = dl->dev_req;
@@ -764,6 +766,8 @@
if (dd < 0)
return dd;
+ memset(di, 0, sizeof(struct hci_dev_info));
+
di->dev_id = dev_id;
ret = ioctl(dd, HCIGETDEVINFO, (void *) di);
@@ -2058,7 +2062,7 @@
return -1;
}
- *timeout = rp.link_sup_to;
+ *timeout = rp.timeout;
return 0;
}
@@ -2069,8 +2073,8 @@
struct hci_request rq;
memset(&cp, 0, sizeof(cp));
- cp.handle = handle;
- cp.link_sup_to = timeout;
+ cp.handle = handle;
+ cp.timeout = timeout;
memset(&rq, 0, sizeof(rq));
rq.ogf = OGF_HOST_CTL;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.2/src/sdp.c new/bluez-libs-3.4/src/sdp.c
--- old/bluez-libs-3.2/src/sdp.c 2006-07-27 06:36:59.000000000 +0200
+++ new/bluez-libs-3.4/src/sdp.c 2006-08-25 03:16:12.000000000 +0200
@@ -208,6 +208,24 @@
return "";
}
+static char *string_lookup_uuid(struct tupla *pt0, const uuid_t* uuid)
+{
+ uuid_t tmp_uuid;
+
+ memcpy(&tmp_uuid, uuid, sizeof(tmp_uuid));
+
+ if (sdp_uuid128_to_uuid(&tmp_uuid)) {
+ switch (tmp_uuid.type) {
+ case SDP_UUID16:
+ return string_lookup(pt0, tmp_uuid.value.uuid16);
+ case SDP_UUID32:
+ return string_lookup(pt0, tmp_uuid.value.uuid32);
+ }
+ }
+
+ return "";
+}
+
/*
* Prints into a string the Protocol UUID
* coping a maximum of n characters.
@@ -231,8 +249,9 @@
snprintf(str, n, str2);
break;
case SDP_UUID128:
- snprintf(str, n, "Error: This is UUID-128");
- return -4;
+ str2 = string_lookup_uuid(message, uuid);
+ snprintf(str, n, str2);
+ break;
default:
snprintf(str, n, "Type of UUID (%x) unknown.", uuid->type);
return -1;
@@ -349,7 +368,7 @@
sdp_data_t *sdp_data_alloc_with_length(uint8_t dtd, const void *value, uint32_t length)
{
sdp_data_t *seq;
- sdp_data_t *d = (sdp_data_t *) malloc(sizeof(sdp_data_t));
+ sdp_data_t *d = malloc(sizeof(sdp_data_t));
if (!d)
return NULL;
@@ -853,7 +872,7 @@
static sdp_data_t *extract_int(const void *p, int *len)
{
- sdp_data_t *d = (sdp_data_t *) malloc(sizeof(sdp_data_t));
+ sdp_data_t *d = malloc(sizeof(sdp_data_t));
SDPDBG("Extracting integer\n");
memset(d, 0, sizeof(sdp_data_t));
@@ -899,11 +918,11 @@
static sdp_data_t *extract_uuid(const uint8_t *p, int *len, sdp_record_t *rec)
{
- sdp_data_t *d = (sdp_data_t *) malloc(sizeof(sdp_data_t));
+ sdp_data_t *d = malloc(sizeof(sdp_data_t));
SDPDBG("Extracting UUID");
memset(d, 0, sizeof(sdp_data_t));
- if (0 > sdp_uuid_extract(p, &d->val.uuid, len)) {
+ if (sdp_uuid_extract(p, &d->val.uuid, len) < 0) {
free(d);
return NULL;
}
@@ -919,7 +938,7 @@
{
char *s;
int n;
- sdp_data_t *d = (sdp_data_t *) malloc(sizeof(sdp_data_t));
+ sdp_data_t *d = malloc(sizeof(sdp_data_t));
memset(d, 0, sizeof(sdp_data_t));
d->dtd = *(uint8_t *) p;
@@ -961,7 +980,7 @@
{
int seqlen, n = 0;
sdp_data_t *curr, *prev;
- sdp_data_t *d = (sdp_data_t *)malloc(sizeof(sdp_data_t));
+ sdp_data_t *d = malloc(sizeof(sdp_data_t));
SDPDBG("Extracting SEQ");
memset(d, 0, sizeof(sdp_data_t));
@@ -1297,7 +1316,7 @@
*/
sdp_list_t *sdp_list_append(sdp_list_t *p, void *d)
{
- sdp_list_t *q, *n = (sdp_list_t *)malloc(sizeof(sdp_list_t));
+ sdp_list_t *q, *n = malloc(sizeof(sdp_list_t));
if (!n)
return 0;
@@ -1335,7 +1354,7 @@
{
sdp_list_t *q, *p, *n;
- n = (sdp_list_t *)malloc(sizeof(sdp_list_t));
+ n = malloc(sizeof(sdp_list_t));
if (!n)
return 0;
n->data = d;
@@ -1471,7 +1490,7 @@
if (sdpdata && sdpdata->dtd >= SDP_SEQ8 && sdpdata->dtd <= SDP_SEQ32) {
sdp_data_t *d;
for (d = sdpdata->val.dataseq; d; d = d->next) {
- uuid_t *u = (uuid_t *)malloc(sizeof(uuid_t));
+ uuid_t *u = malloc(sizeof(uuid_t));
memset((char *)u, 0, sizeof(uuid_t));
if (d->dtd >= SDP_UUID16 && d->dtd <= SDP_UUID128) {
*u = d->val.uuid;
@@ -1553,7 +1572,7 @@
sdp_data_t *pEncoding = pCode->next;
sdp_data_t *pOffset = pEncoding->next;
if (pCode && pEncoding && pOffset) {
- lang = (sdp_lang_attr_t *)malloc(sizeof(sdp_lang_attr_t));
+ lang = malloc(sizeof(sdp_lang_attr_t));
lang->code_ISO639 = pCode->val.uint16;
lang->encoding = pEncoding->val.uint16;
lang->base_offset = pOffset->val.uint16;
@@ -1594,7 +1613,7 @@
}
if (uuid != NULL) {
- profDesc = (sdp_profile_desc_t *)malloc(sizeof(sdp_profile_desc_t));
+ profDesc = malloc(sizeof(sdp_profile_desc_t));
profDesc->uuid = *uuid;
profDesc->version = version;
#ifdef SDP_DEBUG
@@ -2039,7 +2058,7 @@
if (bluetooth_base_uuid == NULL) {
strcpy(baseStr, BASE_UUID);
- bluetooth_base_uuid = (uint128_t *)malloc(sizeof(uint128_t));
+ bluetooth_base_uuid = malloc(sizeof(uint128_t));
data = bluetooth_base_uuid->data;
memset(data, '\0', sizeof(uint128_t));
memset(temp, '\0', 10);
@@ -2201,7 +2220,7 @@
uuid_t *sdp_uuid_to_uuid128(uuid_t *uuid)
{
- uuid_t *uuid128 = (uuid_t *)malloc(sizeof(uuid_t));
+ uuid_t *uuid128 = bt_malloc(sizeof(uuid_t));
memset(uuid128, 0, sizeof(uuid_t));
switch (uuid->type) {
case SDP_UUID128:
@@ -2583,7 +2602,7 @@
sdp_record_t *sdp_record_alloc()
{
- sdp_record_t *rec = (sdp_record_t *)malloc(sizeof(sdp_record_t));
+ sdp_record_t *rec = malloc(sizeof(sdp_record_t));
memset((void *)rec, 0, sizeof(sdp_record_t));
rec->handle = 0xffffffff;
return rec;
@@ -2610,7 +2629,7 @@
if (sdp_list_find(rec->pattern, uuid128, sdp_uuid128_cmp) == NULL)
rec->pattern = sdp_list_insert_sorted(rec->pattern, uuid128, sdp_uuid128_cmp);
else
- free(uuid128);
+ bt_free(uuid128);
SDPDBG("Elements in target pattern : %d\n", sdp_list_len(rec->pattern));
}
@@ -2636,7 +2655,7 @@
int n;
for (n = 0; n < count; n++) {
- uint32_t *pSvcRec = (uint32_t *) malloc(sizeof(uint32_t));
+ uint32_t *pSvcRec = malloc(sizeof(uint32_t));
*pSvcRec = ntohl(bt_get_unaligned((uint32_t *) pdata));
pSeq = sdp_list_append(pSeq, pSvcRec);
pdata += sizeof(uint32_t);
@@ -3301,3 +3320,13 @@
errno = err;
return 0;
}
+
+int sdp_get_socket(const sdp_session_t *session)
+{
+ return session->sock;
+}
+
+uint16_t sdp_gen_tid(sdp_session_t *session)
+{
+ return session->tid++;
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package autoyast2
checked in at Fri Sep 1 01:23:55 CEST 2006.
--------
--- autoyast2/autoyast2.changes 2006-08-16 16:02:06.000000000 +0200
+++ autoyast2/autoyast2.changes 2006-08-31 10:37:26.000000000 +0200
@@ -1,0 +2,38 @@
+Thu Aug 31 10:23:56 CEST 2006 - ug(a)suse.de
+
+- 2.14.6
+
+-------------------------------------------------------------------
+Wed Aug 30 16:31:56 CEST 2006 - ug(a)suse.de
+
+- resize feature added (fate #301130)
+
+-------------------------------------------------------------------
+Mon Aug 28 14:57:06 CEST 2006 - ug(a)suse.de
+
+- reimport scripts after the ask dialog
+- minor documentation updates
+
+-------------------------------------------------------------------
+Fri Aug 25 13:38:14 CEST 2006 - ug(a)suse.de
+
+- the <ask> feature can store the answer in a file now
+
+-------------------------------------------------------------------
+Thu Aug 24 17:18:17 CEST 2006 - ug(a)suse.de
+
+- error handling for ftp access fixed
+- configure and install removed from the examples
+
+-------------------------------------------------------------------
+Thu Aug 24 10:10:13 CEST 2006 - ug(a)suse.de
+
+- "by-path" fixed for <device> configuration in
+ partitioning (#200899)
+
+-------------------------------------------------------------------
+Thu Aug 17 17:03:52 CEST 2006 - ug(a)suse.de
+
+- partition sizes can be configured in % now
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.14.5.tar.bz2
New:
----
autoyast2-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.DEbHEd/_old 2006-09-01 01:23:35.000000000 +0200
+++ /var/tmp/diff_new_pack.DEbHEd/_new 2006-09-01 01:23:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.14.5)
+# spec file for package autoyast2 (Version 2.14.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
URL: http://www.suse.de/~ug
-Version: 2.14.5
+Version: 2.14.6
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.14.5.tar.bz2
+Source0: autoyast2-2.14.6.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -49,7 +49,7 @@
Anas Nashif
%package installation
-Version: 2.14.5
+Version: 2.14.6
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -70,7 +70,7 @@
Anas Nashif
%package utils
-Version: 2.14.5
+Version: 2.14.6
Release: 1
Summary: YaST2 - Auto Installation Utilities
Group: System/YaST
@@ -87,7 +87,7 @@
Uwe Gansert <ug(a)suse.de>
%prep
-%setup -n autoyast2-2.14.5
+%setup -n autoyast2-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -234,6 +234,23 @@
/usr/bin/create_update_source.sh
%changelog -n autoyast2
+* Thu Aug 31 2006 - ug(a)suse.de
+- 2.14.6
+* Wed Aug 30 2006 - ug(a)suse.de
+- resize feature added (fate #301130)
+* Mon Aug 28 2006 - ug(a)suse.de
+- reimport scripts after the ask dialog
+- minor documentation updates
+* Fri Aug 25 2006 - ug(a)suse.de
+- the <ask> feature can store the answer in a file now
+* Thu Aug 24 2006 - ug(a)suse.de
+- error handling for ftp access fixed
+- configure and install removed from the examples
+* Thu Aug 24 2006 - ug(a)suse.de
+- "by-path" fixed for <device> configuration in
+ partitioning (#200899)
+* Thu Aug 17 2006 - ug(a)suse.de
+- partition sizes can be configured in %% now
* Wed Aug 16 2006 - ug(a)suse.de
- fix for "<remove-packages> are cloned now"
- 2.14.5
++++++ autoyast2-2.14.5.tar.bz2 -> autoyast2-2.14.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/VERSION new/autoyast2-2.14.6/VERSION
--- old/autoyast2-2.14.5/VERSION 2006-08-16 16:00:08.000000000 +0200
+++ new/autoyast2-2.14.6/VERSION 2006-08-31 10:23:49.000000000 +0200
@@ -1 +1 @@
-2.14.5
+2.14.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/configure new/autoyast2-2.14.6/configure
--- old/autoyast2-2.14.5/configure 2006-08-16 16:01:16.000000000 +0200
+++ new/autoyast2-2.14.6/configure 2006-08-31 10:24:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for autoyast2 2.14.5.
+# Generated by GNU Autoconf 2.59 for autoyast2 2.14.6.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.14.5'
-PACKAGE_STRING='autoyast2 2.14.5'
+PACKAGE_VERSION='2.14.6'
+PACKAGE_STRING='autoyast2 2.14.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures autoyast2 2.14.5 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.14.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.14.5:";;
+ short | recursive ) echo "Configuration of autoyast2 2.14.6:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.14.5
+autoyast2 configure 2.14.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.14.5, which was
+It was created by autoyast2 $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.14.5'
+ VERSION='2.14.6'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.5"
+VERSION="2.14.6"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug(a)suse.de>"
@@ -2810,7 +2810,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by autoyast2 $as_me 2.14.5, which was
+This file was extended by autoyast2 $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2865,7 +2865,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.14.5
+autoyast2 config.status 2.14.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/configure.in new/autoyast2-2.14.6/configure.in
--- old/autoyast2-2.14.5/configure.in 2006-08-16 16:01:11.000000000 +0200
+++ new/autoyast2-2.14.6/configure.in 2006-08-31 10:24:16.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.14.5, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.14.6, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.5"
+VERSION="2.14.6"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/CreateProfileDetails.xml new/autoyast2-2.14.6/doc/CreateProfileDetails.xml
--- old/autoyast2-2.14.5/doc/CreateProfileDetails.xml 2006-08-02 14:53:38.000000000 +0200
+++ new/autoyast2-2.14.6/doc/CreateProfileDetails.xml 2006-08-30 12:15:33.000000000 +0200
@@ -25,7 +25,7 @@
</title>
<para>
- This is a <emphasis>required</emphasis> section of the profile. General
+ General
options include all the settings related to the installation process and
the environment of the installed system. Among
others it includes the following 4 properties which are required:
@@ -276,7 +276,7 @@
<tbody>
<row>
<entry>device</entry>
- <entry>the device you want to configure in this section
+ <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/edd-int13_dev80</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>.
<para><screen><device>/dev/hda</device></screen></para>
</entry>
<entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry>
@@ -435,7 +435,11 @@
<para>
the size for the partition like 4G, 4500M, ... The /boot partition and the swap partition can have "auto" as
size too, to let autoyast calculate a reasonable size for them. On partition can have the value "max" to fillup
- all available space. Of course, you can't have two partitions with the size value "max".
+ all available space.
+ </para>
+ <para>
+ with SUSE Linux 10.2 and SLES10 SP1, you can specify the the size in percentage. So 10% will use 10% of the size
+ of the harddisk/VG. You can mix auto,max,sizes and percentage like you want.
</para>
<para><screen><size>10G</size></screen></para>
</entry>
@@ -482,7 +486,7 @@
<entry>partition_nr</entry>
<entry>
<para>
- the partition_nr this partition have/will have. If you have create=false, then you can tell
+ the partition_nr this partition has/will have. If you have set create=false, then you can tell
autoyast which partition you mean by the partition_nr. You can force autoyast to create only
primary partitions by configuring only partition numbers below 5.
</para>
@@ -586,6 +590,23 @@
</entry>
<entry></entry>
</row>
+ <row>
+ <entry>resize</entry>
+ <entry>
+ <para>
+ This parameter is available since SLES10 SP1 and OpenSUSE 10.2.
+ This boolean must be true if an existing partition should be resized. In this case,
+ you want to set <emphasis>create</emphasis> to <emphasis>false</emphasis> too and in
+ most cases you don't want to <emphasis>format</emphasis> the partition. You need to
+ tell autoyast the <emphasis>partition_nr</emphasis> and the <emphasis>size</emphasis>.
+ The size can be in percentage of the original size or as a number of the new size, like
+ <emphasis>800M</emphasis>. <emphasis>max</emphasis> and <emphasis>auto</emphasis> don't
+ work as size here.
+ </para>
+ <para><screen><resize config:type="boolean">false</resize></screen></para>
+ </entry>
+ <entry>The resize only works with physical disks. Not with LVM/EVMS volumes.</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -1081,30 +1102,7 @@
with the volume group <emphasis>system</emphasis>. The partition
created will use all available space on this drive.
</para>
- <note>
- <para>
- Up to SuSE Linux 8.2 the LVM configuration was done in a separate
- resource. This method for configuring LVM is still
- supported, however a new and easier way is now possible which allows you
- to have the LVM configuration
- directly in the <emphasis>partitioning</emphasis> resource.
- </para>
- </note>
- <para>Currently it is not possible to configure LVM using the
- configuration system, instead it is required to
- add the resource manually as shown in the following example:
- </para>
- <example>
- <title>
- LVM Logical Volumes (Old syntax)
- </title>
- <screen>
-<xi:include href="examples/example.lvmold.xml" parse="text"
- xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </screen>
- </example>
- <para>Using the new method, the above configuration has the following syntax:</para>
<example>
<title>
LVM Logical Volumes (New syntax)
@@ -1196,32 +1194,13 @@
create and additionally you need to specify whether a partition or a device should be configured in the
<acronym>RAID</acronym> or if it should configured as a <emphasis>Spare</emphasis> device.
</para>
- <note>
- <para>
- Up to SuSE Linux 8.2 the raid configuration was done in a separate
- resource. This method for configuring raid devices is still
- supported, however a new and easier way is now possible
- which allows the user to have the raid configuration
- directly in the <emphasis>partitioning</emphasis> resource.
- </para>
- </note>
<para>
The following example shows a simple RAID1 configuration:
</para>
- <example>
- <title>RAID1 configuration (Old Syntax)</title>
- <screen>
-<xi:include href="examples/example.raidold.xml" parse="text"
- xmlns:xi="http://www.w3.org/2001/XInclude"/>
- </screen>
- </example>
-
- <para>Using the new method, the above configuration has the following syntax:</para>
-
<example>
- <title>RAID1 configuration (New Syntax)</title>
+ <title>RAID1 configuration</title>
<screen>
<xi:include href="examples/example.raidnew.xml" parse="text"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -1231,7 +1210,7 @@
<para>
The following has to be taken into consideration when configuring
- raid using the new syntax:
+ raid:
</para>
<itemizedlist>
<listitem>
@@ -1310,7 +1289,7 @@
<section id="Software.Selections.sles10">
<title>
- Package Selections with patterns (SLES10)
+ Package Selections with patterns (SLES10 and SUSE Linux 10.2)
</title>
<para>
SLES10 no longer supports <emphasis>selections</emphasis> but uses
@@ -2508,7 +2487,13 @@
list of users in the profile. The path can never end with a number (that's not a restriction, it can't be
a number if you think about it).
<para><screen><path>networking,dns,hostname</path></screen></para></entry>
- <entry>you must provide this information</entry>
+ <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
+ </row>
+ <row>
+ <entry>file (available since SLES10 SP1 and SL 10.2)</entry>
+ <entry>you can store the answer to a question in a file, to use it in one of your scripts later.
+ <para><screen><file>/tmp/answer_hostname</file></screen></para></entry>
+ <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
</row>
<row>
<entry>password</entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.autodetectpart.xml new/autoyast2-2.14.6/doc/examples/example.autodetectpart.xml
--- old/autoyast2-2.14.5/doc/examples/example.autodetectpart.xml 2005-02-08 18:27:06.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.autodetectpart.xml 2006-08-24 15:51:21.000000000 +0200
@@ -1,6 +1,4 @@
- <install>
-
<partitioning config:type="list">
<drive>
<partitions config:type="list">
@@ -20,5 +18,3 @@
</partitions>
</drive>
</partitioning>
-
- </install>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.bootloader.xml new/autoyast2-2.14.6/doc/examples/example.bootloader.xml
--- old/autoyast2-2.14.5/doc/examples/example.bootloader.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.bootloader.xml 2006-08-24 15:51:39.000000000 +0200
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE profile SYSTEM "/usr/share/autoinstall/dtd/profile.dtd">
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
- <install>
<bootloader>
<global config:type="list">
<global_entry>
@@ -14,5 +13,4 @@
<location>mbr</location>
<sections config:type="list"/>
</bootloader>
- </install>
</profile>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.bootloader2.xml new/autoyast2-2.14.6/doc/examples/example.bootloader2.xml
--- old/autoyast2-2.14.5/doc/examples/example.bootloader2.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.bootloader2.xml 2006-08-24 15:51:32.000000000 +0200
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE profile SYSTEM "/usr/share/autoinstall/dtd/profile.dtd">
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
- <install>
<bootloader>
<board_type>iseries</board_type>
<global config:type="list"/>
@@ -15,5 +14,4 @@
<location></location>
<prep_boot_partition>/dev/hda1</prep_boot_partition>
</bootloader>
- </install>
</profile>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.customSoftware.xml new/autoyast2-2.14.6/doc/examples/example.customSoftware.xml
--- old/autoyast2-2.14.5/doc/examples/example.customSoftware.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.customSoftware.xml 2006-08-24 15:51:56.000000000 +0200
@@ -1,9 +1,7 @@
-<install>
...
<software>
<base>My</base>
</software>
...
-</install>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.fstab.xml new/autoyast2-2.14.6/doc/examples/example.fstab.xml
--- old/autoyast2-2.14.5/doc/examples/example.fstab.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.fstab.xml 2006-08-24 15:52:05.000000000 +0200
@@ -1,5 +1,4 @@
- <install>
<partitioning_advanced>
<fstab>
<!-- Read data from existing fstab. If multiple root partitions are
@@ -18,4 +17,3 @@
</partitions>
</fstab>
</partitioning_advanced>
- </install>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.generalOptions.xml new/autoyast2-2.14.6/doc/examples/example.generalOptions.xml
--- old/autoyast2-2.14.5/doc/examples/example.generalOptions.xml 2006-06-26 13:46:58.000000000 +0200
+++ new/autoyast2-2.14.6/doc/examples/example.generalOptions.xml 2006-08-28 11:43:01.000000000 +0200
@@ -10,13 +10,8 @@
</signature-handling>
<mode>
<confirm config:type="boolean">true</confirm>
- <forceboot config:type="boolean">false</forceboot>
<second_stage config:type="boolean">true<second_stage>
</mode>
- <mouse>
- <device>/dev/psaux</device>
- <id>ps0</id>
- </mouse>
</general>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.hosts.xml new/autoyast2-2.14.6/doc/examples/example.hosts.xml
--- old/autoyast2-2.14.5/doc/examples/example.hosts.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.hosts.xml 2006-08-24 15:53:46.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
- <configure>
<host>
<hosts config:type="list">
<host>
@@ -25,4 +24,4 @@
</host>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.inetd.xml new/autoyast2-2.14.6/doc/examples/example.inetd.xml
--- old/autoyast2-2.14.5/doc/examples/example.inetd.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.inetd.xml 2006-08-24 15:54:00.000000000 +0200
@@ -6,7 +6,6 @@
<![CDATA[
<profile>
- <configure>
...
<inetd>
<netd_service config:type="symbol">xinetd</netd_service>
@@ -31,8 +30,7 @@
</netd_conf>
</inetd>
...
- </configure>
</profile>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.keepingpart.xml new/autoyast2-2.14.6/doc/examples/example.keepingpart.xml
--- old/autoyast2-2.14.5/doc/examples/example.keepingpart.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.keepingpart.xml 2006-08-24 15:52:17.000000000 +0200
@@ -1,5 +1,4 @@
- <install>
<partitioning config:type="list">
<drive>
@@ -38,5 +37,4 @@
<use>6</use>
</drive>
</partitioning>
- </install>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.ldapclient.xml new/autoyast2-2.14.6/doc/examples/example.ldapclient.xml
--- old/autoyast2-2.14.5/doc/examples/example.ldapclient.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.ldapclient.xml 2006-08-24 15:54:24.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
-<configure>
...
<ldap>
<ldap_domain> dc=mydomain,dc=com</ldap_domain>
@@ -15,7 +14,6 @@
<start_ldap config:type="boolean">true</start_ldap>
</ldap>
...
-</configure>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.mail.xml new/autoyast2-2.14.6/doc/examples/example.mail.xml
--- old/autoyast2-2.14.5/doc/examples/example.mail.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.mail.xml 2006-08-24 15:54:37.000000000 +0200
@@ -1,4 +1,3 @@
-<configure>
...
<mail>
<aliases config:type="list">
@@ -75,4 +74,3 @@
</virtual_users>
</mail>
...
-</configure>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.network.xml new/autoyast2-2.14.6/doc/examples/example.network.xml
--- old/autoyast2-2.14.5/doc/examples/example.network.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.network.xml 2006-08-24 15:54:52.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
- <configure>
.....
<networking>
<dns>
@@ -40,7 +39,6 @@
</modules>
</networking>
....
- </configure>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.nfs.xml new/autoyast2-2.14.6/doc/examples/example.nfs.xml
--- old/autoyast2-2.14.5/doc/examples/example.nfs.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.nfs.xml 2006-08-24 15:55:10.000000000 +0200
@@ -1,4 +1,3 @@
-<configure>
...
<nfs config:type="list">
<nfs_entry>
@@ -8,4 +7,3 @@
</nfs_entry>
</nfs>
...
-</configure>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.nfsserver.xml new/autoyast2-2.14.6/doc/examples/example.nfsserver.xml
--- old/autoyast2-2.14.5/doc/examples/example.nfsserver.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.nfsserver.xml 2006-08-24 15:55:01.000000000 +0200
@@ -1,4 +1,3 @@
- <configure>
....
<nfs_server>
<nfs_exports config:type="list">
@@ -18,4 +17,3 @@
<start_nfsserver config:type="boolean">true</start_nfsserver>
</nfs_server>
....
- </configure>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.nis.xml new/autoyast2-2.14.6/doc/examples/example.nis.xml
--- old/autoyast2-2.14.5/doc/examples/example.nis.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.nis.xml 2006-08-24 15:55:21.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
-<configure>
...
<nis>
<nis_broadcast config:type="boolean">true</nis_broadcast>
@@ -29,7 +28,6 @@
<start_nis config:type="boolean">true</start_nis>
</nis>
...
-</configure>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.ntp.xml new/autoyast2-2.14.6/doc/examples/example.ntp.xml
--- old/autoyast2-2.14.5/doc/examples/example.ntp.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.ntp.xml 2006-08-24 15:55:31.000000000 +0200
@@ -2,7 +2,6 @@
<?xml version="1.0"?>
<!DOCTYPE profile SYSTEM "/usr/share/autoinstall/dtd/profile.dtd">
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
- <configure>
<ntp-client>
<configure_dhcp config:type="boolean">false</configure_dhcp>
<peers config:type="list">
@@ -16,6 +15,5 @@
<start_at_boot config:type="boolean">true</start_at_boot>
<start_in_chroot config:type="boolean">true</start_in_chroot>
</ntp-client>
- </configure>
</profile>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.online_update.xml new/autoyast2-2.14.6/doc/examples/example.online_update.xml
--- old/autoyast2-2.14.5/doc/examples/example.online_update.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.online_update.xml 2006-08-24 15:55:46.000000000 +0200
@@ -1,5 +1,4 @@
-<configure>
<online_update>
<autoget config:type="boolean">true</autoget>
@@ -12,4 +11,3 @@
</update_time>
</online_update>
-</configure>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.partitioning3.xml new/autoyast2-2.14.6/doc/examples/example.partitioning3.xml
--- old/autoyast2-2.14.5/doc/examples/example.partitioning3.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.partitioning3.xml 2006-08-24 15:52:27.000000000 +0200
@@ -1,5 +1,4 @@
- <install>
<partitioning config:type="list">
<drive>
<device>/dev/hda</device>
@@ -58,4 +57,3 @@
<package>nfs-utils</package>
</packages>
</software>
- </install>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.printer.xml new/autoyast2-2.14.6/doc/examples/example.printer.xml
--- old/autoyast2-2.14.5/doc/examples/example.printer.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.printer.xml 2006-08-24 15:55:57.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
- <configure>
....
<printer>
<default>lp</default>
@@ -26,7 +25,6 @@
</printcap>
</printer>
....
- </configure>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.proxy.xml new/autoyast2-2.14.6/doc/examples/example.proxy.xml
--- old/autoyast2-2.14.5/doc/examples/example.proxy.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.proxy.xml 2006-08-24 15:56:15.000000000 +0200
@@ -2,7 +2,6 @@
<?xml version="1.0"?>
<!DOCTYPE profile SYSTEM "/usr/share/autoinstall/dtd/profile.dtd">
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
- <configure>
<proxy>
<enabled config:type="boolean">true</enabled>
<ftp_proxy>http://192.168.1.240:3128</ftp_proxy>
@@ -11,6 +10,5 @@
<proxy_password>testpw</proxy_password>
<proxy_user>testuser</proxy_user>
</proxy>
- </configure>
</profile>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.reporting.xml new/autoyast2-2.14.6/doc/examples/example.reporting.xml
--- old/autoyast2-2.14.5/doc/examples/example.reporting.xml 2005-02-08 18:27:08.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.reporting.xml 2006-08-24 15:52:37.000000000 +0200
@@ -1,5 +1,4 @@
- <install>
<report>
<messages>
@@ -19,4 +18,3 @@
</warnings>
</report>
- </install>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.runlevels.xml new/autoyast2-2.14.6/doc/examples/example.runlevels.xml
--- old/autoyast2-2.14.5/doc/examples/example.runlevels.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.runlevels.xml 2006-08-24 15:56:26.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
-<configure>
....
<runlevel>
<default>3</default>
@@ -24,7 +23,6 @@
</services>
</runlevel>
....
-</configure>
]]>
</screen>
</example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.scripts.xml new/autoyast2-2.14.6/doc/examples/example.scripts.xml
--- old/autoyast2-2.14.5/doc/examples/example.scripts.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.scripts.xml 2006-08-24 15:56:41.000000000 +0200
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE profile SYSTEM "/usr/share/autoinstall/dtd/profile.dtd">
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
- <configure>
<scripts>
<chroot-scripts config:type="list">
<script>
@@ -70,5 +69,4 @@
</script>
</pre-scripts>
</scripts>
- </configure>
</profile>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.security.xml new/autoyast2-2.14.6/doc/examples/example.security.xml
--- old/autoyast2-2.14.5/doc/examples/example.security.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.security.xml 2006-08-24 15:56:53.000000000 +0200
@@ -8,7 +8,6 @@
</para>
<screen>
<![CDATA[
-<configure>
...
<security>
<console_shutdown>ignore</console_shutdown>
@@ -34,7 +33,6 @@
<uid_min>500</uid_min>
</security>
...
-</configure>
]]>
</screen>
</example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.sound.xml new/autoyast2-2.14.6/doc/examples/example.sound.xml
--- old/autoyast2-2.14.5/doc/examples/example.sound.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.sound.xml 2006-08-24 15:57:03.000000000 +0200
@@ -4,7 +4,6 @@
</title>
<screen>
<![CDATA[
- <configure>
....
<sound>
<autoinstall config:type="boolean">true</autoinstall>
@@ -28,7 +27,6 @@
</sound>
....
- </configure>
]]>
</screen>
- </example>
\ No newline at end of file
+ </example>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.users.xml new/autoyast2-2.14.6/doc/examples/example.users.xml
--- old/autoyast2-2.14.5/doc/examples/example.users.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.users.xml 2006-08-24 15:57:13.000000000 +0200
@@ -1,6 +1,5 @@
-<configure>
...
<users config:type="list">
<user>
@@ -19,4 +18,3 @@
</user>
</users>
...
-</configure>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/doc/examples/example.x11.xml new/autoyast2-2.14.6/doc/examples/example.x11.xml
--- old/autoyast2-2.14.5/doc/examples/example.x11.xml 2005-02-08 18:27:07.000000000 +0100
+++ new/autoyast2-2.14.6/doc/examples/example.x11.xml 2006-08-24 15:57:21.000000000 +0200
@@ -1,4 +1,3 @@
-<configure>
...
<x11>
<color_depth>16</color_depth>
@@ -23,4 +22,3 @@
...
-</configure>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/clients/inst_autosetup.ycp new/autoyast2-2.14.6/src/clients/inst_autosetup.ycp
--- old/autoyast2-2.14.5/src/clients/inst_autosetup.ycp 2006-04-21 14:40:13.000000000 +0200
+++ new/autoyast2-2.14.6/src/clients/inst_autosetup.ycp 2006-08-28 14:56:55.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif <nashif(a)suse.de>
* Uwe Gansert <ug(a)suse.de>
*
- * $Id: inst_autosetup.ycp 30346 2006-04-21 12:40:09Z ug $
+ * $Id: inst_autosetup.ycp 32595 2006-08-28 12:58:31Z ug $
*/
{
@@ -103,7 +103,6 @@
"));
return `abort;
}
- AutoinstScripts::Import(Profile::current["scripts"]:$[]);
}
//
@@ -112,6 +111,8 @@
askDialog();
+ // reimport scripts, for the case <ask> has changed them
+ AutoinstScripts::Import(Profile::current["scripts"]:$[]);
//
// Set Mouse and other workflow variables
//
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/dialogs/ask.ycp new/autoyast2-2.14.6/src/dialogs/ask.ycp
--- old/autoyast2-2.14.5/src/dialogs/ask.ycp 2005-12-07 11:35:25.000000000 +0100
+++ new/autoyast2-2.14.6/src/dialogs/ask.ycp 2006-08-25 13:20:48.000000000 +0200
@@ -31,6 +31,7 @@
string question = ask["question"]:pathStr;
string helptext = ask["help"]:"";
string title = ask["title"]:"";
+ string file = ask["file"]:"";
list< map<string,any> > s = ask["selection"]:[];
mod = true;
@@ -114,7 +115,12 @@
pos = add(pos, p);
}
});
- Profile::current = Profile::setElementByList( pos, val, Profile::current );
+ if( pathStr != "" )
+ Profile::current = Profile::setElementByList( pos, val, Profile::current );
+ if( file != "" ) {
+ if( ! SCR::Write (.target.string, file, sformat("%1",val)) )
+ y2milestone("writing answer to %1 failed",file);
+ }
break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/dialogs/partition_dialogs.ycp new/autoyast2-2.14.6/src/dialogs/partition_dialogs.ycp
--- old/autoyast2-2.14.5/src/dialogs/partition_dialogs.ycp 2006-08-11 15:31:34.000000000 +0200
+++ new/autoyast2-2.14.6/src/dialogs/partition_dialogs.ycp 2006-08-30 16:27:26.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif <nashif(a)suse.de>
*
- * $Id: partition_dialogs.ycp 32345 2006-08-11 13:33:10Z ug $
+ * $Id: partition_dialogs.ycp 32640 2006-08-30 14:29:00Z ug $
*/
{
textdomain "autoinst";
@@ -118,7 +118,7 @@
list<map> other_drives = filter (map d, partitioning, ``(d["device"]:"" != drive));
map<symbol, map<symbol, any> > file_systems = FileSystems::GetAllFileSystems(true, true);
- boolean create = new_val["create"]:false;
+ boolean create = new_val["create"]:true;
string partition_size = new_val["size"]:"";
string partition_nr = tostring(new_val["partition_nr"]:-1);
if( partition_nr == "-1" )
@@ -131,6 +131,9 @@
symbol last_option_fs = new_val["filesystem"]:`ext2;
map fs_options = new_val["fs_options"]:$[];
+ boolean resize = new_val["resize"]:false;
+ boolean reuse = !create;
+
list<string> not_used_mountpoints = notUsedMountpoints( getTargets(), file_systems[last_option_fs, `mountpoints]:[]);
@@ -176,7 +179,14 @@
`RadioButton(`id(`reuse),
`opt(`notify),
_("&Reuse Partition"),
- (partition_size == "" && partition_nr != "")
+ reuse
+ )
+ ),
+ `Left(
+ `CheckBox(`id(`resize),
+ `opt(`notify),
+ _("R&esize Partition"),
+ resize
)
),
`Left(
@@ -292,6 +302,7 @@
if( this_drive["type"]:`x != `CT_LVM && this_drive["type"]:`x != `CT_EVMS ) {
UI::ChangeWidget(`id(`lv_name), `Enabled, false);
}
+ UI::ChangeWidget(`id(`resize), `Enabled, UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse );
while (true)
{
@@ -300,6 +311,7 @@
if (ret != `cancel)
{
+ UI::ChangeWidget(`id(`resize), `Enabled, UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse );
if( ret == `fsid_point ) {
if( substring( (string)UI::QueryWidget(`id(`fsid_point), `Value), 0, 4 ) == "0x8E" ) {
UI::ChangeWidget(`id(`vg), `Enabled, true);
@@ -312,11 +324,14 @@
}
if ( UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `max
|| UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `auto
- || UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse )
+ || (UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse && UI::QueryWidget(`id(`resize), `Value) == false)
+ )
{
UI::ChangeWidget(`id(`partsize) , `Enabled, false);
- }
- else
+ } else if( UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ) {
+ UI::ChangeWidget(`id(`partsize) , `Enabled, true );
+ UI::ChangeWidget(`id(`resize), `Enabled, true );
+ } else
{
UI::ChangeWidget(`id(`partsize) , `Enabled, true);
}
@@ -565,6 +580,13 @@
}
}
+ if( UI::QueryWidget(`id(`resize), `Value) == true && (symbol) UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ) {
+ return_value = add( return_value, "resize", true );
+ return_value["create"] = false;
+ } else {
+ return_value = add( return_value, "resize", false );
+ }
+
y2milestone("fs options: %1", fs_options);
if ( fs_options != $[] && return_value["format"]:false )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/include/autopart.ycp new/autoyast2-2.14.6/src/include/autopart.ycp
--- old/autoyast2-2.14.5/src/include/autopart.ycp 2006-06-08 13:39:10.000000000 +0200
+++ new/autoyast2-2.14.6/src/include/autopart.ycp 2006-08-31 09:38:15.000000000 +0200
@@ -1,7 +1,7 @@
/*
-$Id: autopart.ycp 31389 2006-06-08 11:39:08Z ug $
+$Id: autopart.ycp 32646 2006-08-31 07:39:51Z ug $
*/
{
textdomain "autoinst";
@@ -77,7 +77,7 @@
define list<map> preprocess_partition_config(list<map> xmlflex) {
y2debug("xml input: %1", xmlflex );
-
+ map<string,any> tm = Storage::GetTargetMap();
list<map>partitioning = maplist(map d, xmlflex, ``{
foreach( string key, [ "keep_partition_id", "keep_partition_num"], ``{
@@ -748,6 +748,10 @@
if( !p["delete"]:false && p["nr"]:0 == e["added",0,1]:0 )
{
p["format"] = solution["partitions",pindex,"format"]:true;
+ if( solution["partitions",pindex,"resize"]:false == true ) {
+ p["resize"] = true;
+ p["region"] = solution["partitions",pindex,"region"]:[];
+ }
p["mount"] = mount;
if (e["reuse"]:false)
p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:`reiser;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/include/io.ycp new/autoyast2-2.14.6/src/include/io.ycp
--- old/autoyast2-2.14.5/src/include/io.ycp 2006-07-06 10:59:27.000000000 +0200
+++ new/autoyast2-2.14.6/src/include/io.ycp 2006-08-24 17:15:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: I/O
* Authors: Anas Nashif<nashif(a)suse.de>
*
- * $Id: io.ycp 31740 2006-07-06 09:00:58Z ug $
+ * $Id: io.ycp 32560 2006-08-24 15:16:54Z ug $
*/
{
textdomain "autoinst";
@@ -90,7 +90,7 @@
if ( Scheme == "ftp" )
{
res = FTP::Get(full_url, Localfile);
- if ( ( res["code"]:-1 >= 200 || res["code"]:-1 < 300 ) && SCR::Read(.target.size, Localfile) > 0 )
+ if ( ( res["code"]:-1 >= 200 && res["code"]:-1 < 300 ) && SCR::Read(.target.size, Localfile) > 0 )
{
GET_error = "";
return (true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/modules/AutoinstLVM.ycp new/autoyast2-2.14.6/src/modules/AutoinstLVM.ycp
--- old/autoyast2-2.14.5/src/modules/AutoinstLVM.ycp 2006-08-08 13:41:06.000000000 +0200
+++ new/autoyast2-2.14.6/src/modules/AutoinstLVM.ycp 2006-08-17 17:04:41.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: LVM
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: AutoinstLVM.ycp 32234 2006-08-08 11:42:37Z ug $
+ * $Id: AutoinstLVM.ycp 32415 2006-08-17 15:06:17Z ug $
*/
{
@@ -23,6 +23,8 @@
include "partitioning/lvm_lv_lib.ycp";
+ include "partitioning/partition_defines.ycp";
+
global symbol vmType = `CT_LVM;
global boolean ZeroNewPartitions = true;
@@ -407,6 +409,17 @@
}
buffer = (buffer * 2) / 1024;
+ volume_group["partitions"] = maplist( map lv, volume_group["partitions"]:[], ``{
+ integer s = kmgt_str_to_byte( lv["size"]:"10000" );
+ if( s <= 100 && s > 0 ) {
+ // we assume percentage for this lv
+ integer integer_k = freeSpace * tointeger(lv["size"]:"0") / 100;
+ lv["size_k"] = integer_k;
+ y2milestone("percentage for lv %1. Size_k is %2",lv,integer_k);
+ }
+ return lv;
+ });
+
foreach(map lv, volume_group["partitions"]:[], ``{
freeSpace = freeSpace - lv["size_k"]:0;
y2milestone("freeSpace = %1",freeSpace);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.5/src/modules/AutoinstStorage.ycp new/autoyast2-2.14.6/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.14.5/src/modules/AutoinstStorage.ycp 2006-08-04 14:35:12.000000000 +0200
+++ new/autoyast2-2.14.6/src/modules/AutoinstStorage.ycp 2006-08-30 16:27:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: AutoinstStorage.ycp 32153 2006-08-04 12:36:47Z ug $
+ * $Id: AutoinstStorage.ycp 32640 2006-08-30 14:29:00Z ug $
*/
{
module "AutoinstStorage";
@@ -19,7 +19,7 @@
import "Partitions";
import "Popup";
-
+ include "partitioning/partition_defines.ycp";
// Read existing fstab and format partitions, but dont create anything
// Use same mountpoints etc.
@@ -71,6 +71,33 @@
include "autoinstall/autopart.ycp";
include "autoinstall/autoinst_dialogs.ycp";
+ global define string find_first_disk() {
+ map <string, map> initial_target_map = Storage::GetTargetMap();
+ y2milestone("Target map: %1", initial_target_map );
+
+ string mbr_disk = "";
+ foreach (string device, map disk, initial_target_map, ``{
+ if (disk["bios_id"]:"" == "0x80")
+ {
+ y2milestone ("disk with bios_id 0x80: %1", device);
+ mbr_disk = device;
+ }
+ });
+
+ /* device guessing code enhanced */
+ if( mbr_disk == "" ) {
+ foreach (string device, map disk, initial_target_map, ``{
+ if( disk["type"]:`x == `CT_DISK ) {
+ y2milestone ("first real disk is: %1", device);
+ mbr_disk = device;
+ break;
+ }
+ });
+ }
+
+ y2milestone("mbr disk: %1", mbr_disk);
+ return mbr_disk;
+ }
/**
* Pre-process partition plan and prepare for creating partitions.
@@ -307,7 +334,10 @@
settings = maplist( map d, settings, ``{
string device = d["device"]:"";
string udev_string = "";
- if( issubstring( device, "by-id" ) )
+ if( device == "" ) {
+ d["device"] = find_first_disk();
+ y2milestone("empty device in profile set to %1", d["device"]:"");
+ } else if( issubstring( device, "by-id" ) )
udev_string = "udev_id";
else if( issubstring( device, "by-path" ) )
udev_string = "udev_path";
@@ -316,10 +346,16 @@
string wanted_udev = substring( device, index+1 );
foreach( string deviceName, map tmp_target, tm, ``{
y2milestone("searching for %1 on %2", wanted_udev, deviceName );
- foreach( string found_udev, tmp_target[udev_string]:[], ``{
+ list<string> liste = [];
+ if( udev_string == "udev_id" )
+ liste = tmp_target[udev_string]:[];
+ else
+ liste = [ tmp_target[udev_string]:"" ];
+ foreach( string found_udev, liste, ``{
if( found_udev == wanted_udev ) {
d["device"] = deviceName;
y2milestone("found mapping of %1 to %2",found_udev, deviceName);
+ break;
}
});
});
@@ -362,7 +398,7 @@
integer s = pe["size"]:0;
if( s == max ) {
y2milestone("shrinking %1",pe);
- s = s - ((usedSize - sizeByCyl)/cyl_size+1)*cyl_size;
+ s = s - ((usedSize - sizeByCyl)/cyl_size+2)*cyl_size; // FIXME: why 2? 1 should be enough
usedSize = usedSize - s;
y2milestone("shrinking to %1",s);
pe["size"] = s;
@@ -377,6 +413,68 @@
return settings;
}
+ global define list<map> region4resize( list<map> settings ) {
+ // the storage lib requires the region to be set
+ // we transform the size to the region here
+ map <string, map> tm = Storage::GetTargetMap();
+ settings = maplist( map d, settings, ``{
+ if( d["type"]:`x == `CT_DISK ) {
+ map realDisk = tm[ d["device"]:"" ]:$[];
+ integer index = 0;
+ d["partitions"] = maplist(map pe, d["partitions"]:[], ``{
+ if( pe["resize"]:false ) {
+ integer currentCyl = realDisk["partitions",index,"region",1]:0;
+ pe["region"] = realDisk["partitions",index,"region"]:[];
+ if( issubstring( pe["size"]:"", "%") ) {
+ string percentage = deletechars( pe["size"]:"", "%" );
+ integer newCyl = currentCyl * tointeger(percentage) / 100;
+ pe["region",1] = newCyl;
+ } else {
+ integer new_size = kmgt_str_to_byte( pe["size"]:"0" );
+ integer newCyl = new_size/realDisk["cyl_size"]:1;
+ pe["region",1] = newCyl;
+ }
+ y2milestone("resize partition nr %1 of %2 to region: %3", index, d["device"]:"", pe["region"]:[]);
+ }
+ index = index + 1;
+ return pe;
+ });
+ }
+ return d;
+ });
+ y2milestone("after region4resize = %1",settings);
+ return settings;
+ }
+
+ global define list<map> percent2size( list<map> settings ) {
+ map <string, map> tm = Storage::GetTargetMap();
+ settings = maplist( map d, settings, ``{
+ if( d["type"]:`x == `CT_DISK ) {
+ map v = tm[ d["device"]:"" ]:$[];
+ d["partitions"] = maplist(map pe, d["partitions"]:[], ``{
+ if( issubstring( pe["size"]:"", "%") ) {
+ string percentage = deletechars( pe["size"]:"", "%" );
+ integer device_size = v["cyl_count"]:0 * v["cyl_size"]:0;
+ pe["size"] = sformat("%1", device_size * tointeger(percentage) / 100);
+ y2milestone("percentage %1 of %2 = %3",percentage,d["device"]:"",pe["size"]:"");
+ }
+ return pe;
+ });
+ } else if( d["type"]:`x == `CT_LVM || d["type"]:`x == `CT_EVMS ) {
+ d["partitions"] = maplist(map pe, d["partitions"]:[], ``{
+ if( issubstring( pe["size"]:"", "%") ) {
+ pe["size"] = deletechars( pe["size"]:"", "%" ); // a size smalle than 101 will be treated as % later
+ }
+ return pe;
+ });
+ }
+ return d;
+ });
+ y2milestone("after percent2size = %1",settings);
+ return settings;
+ }
+
+
/**
* Get all the configuration from a map.
* When called by inst_auto<module name> (preparing autoinstallation data)
@@ -390,6 +488,8 @@
if (Mode::autoinst()) {
settings = udev2dev(settings);
settings = mountBy(settings);
+ settings = region4resize(settings);
+ settings = percent2size(settings);
AutoPartPlan = preprocess_partition_config(settings);
AutoPartPlan = checkSizes(AutoPartPlan);
} else {
@@ -491,6 +591,7 @@
return true;
}
+
/**
* Create partition plan
* @return boolean
@@ -502,33 +603,11 @@
if (read_fstab)
return (handle_fstab());
- // Find first disk
map <string, map> initial_target_map = Storage::GetTargetMap();
y2milestone("Target map: %1", initial_target_map );
-
- string mbr_disk = "";
- foreach (string device, map disk, initial_target_map, ``{
- if (disk["bios_id"]:"" == "0x80")
- {
- y2milestone ("disk with bios_id 0x80: %1", device);
- mbr_disk = device;
- }
- });
- /* device guessing code enhanced */
- if( mbr_disk == "" ) {
- foreach (string device, map disk, initial_target_map, ``{
- if( disk["type"]:`x == `CT_DISK ) {
- y2milestone ("first real disk is: %1", device);
- mbr_disk = device;
- break;
- }
- });
- }
+ Storage::SetPartDisk( find_first_disk() );
- y2milestone("mbr disk: %1", mbr_disk);
- Storage::SetPartDisk(mbr_disk);
-
AutoTargetMap = set_devices(AutoPartPlan);
if (AutoTargetMap == nil || AutoTargetMap == $[])
return false;
@@ -568,7 +647,6 @@
tm[device] = process_partition_data(device, sol);
SearchRaids(tm);
-
Storage::SetTargetMap(tm);
}
});
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package arts
checked in at Fri Sep 1 01:23:33 CEST 2006.
--------
--- KDE/arts/arts.changes 2006-08-23 10:40:17.000000000 +0200
+++ arts/arts.changes 2006-08-31 13:37:40.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 13:37:23 CEST 2006 - stbinner(a)suse.de
+
+- add man page for artswrapper (#187356)
+
+-------------------------------------------------------------------
New:
----
artswrapper.7.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arts.spec ++++++
--- /var/tmp/diff_new_pack.vznA5A/_old 2006-09-01 01:20:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vznA5A/_new 2006-09-01 01:20:47.000000000 +0200
@@ -22,8 +22,9 @@
Summary: Modular Software Synthesizer
PreReq: permissions
Version: 1.5.4
-Release: 3
+Release: 4
Source0: %{name}-%{version}.tar.bz2
+Source1: artswrapper.7.gz
Patch0: 1_5_BRANCH.diff
Patch2: no-informational-messages.diff
Patch4: resmgr-oss.diff
@@ -127,6 +128,8 @@
mkdir -p $RPM_BUILD_ROOT/opt/kde3/lib/
ln -sf ../lib64/mcop $RPM_BUILD_ROOT/opt/kde3/lib/mcop
%endif
+mkdir -p -m 755 $RPM_BUILD_ROOT/%_mandir/man7
+cp %SOURCE1 $RPM_BUILD_ROOT/%_mandir/man7/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -169,6 +172,7 @@
%ifarch x86_64 s390x
/opt/kde3/lib
%endif
+%{_mandir}/man7/artswrapper.7.gz
%if %suse_version > 800
%files gmcop
@@ -185,6 +189,8 @@
/opt/kde3/%_lib/*.la
%changelog -n arts
+* Thu Aug 31 2006 - stbinner(a)suse.de
+- add man page for artswrapper (#187356)
* Wed Aug 23 2006 - stbinner(a)suse.de
- add 1_5_BRANCH.diff
* Sun Jul 23 2006 - coolo(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package audit
checked in at Fri Sep 1 01:23:26 CEST 2006.
--------
--- audit/audit-libs-python.changes 2006-08-16 16:19:29.000000000 +0200
+++ audit/audit-libs-python.changes 2006-08-31 22:59:12.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 22:57:52 CEST 2006 - tonyj(a)suse.de
+
+- Upgrade to 1.2.6-1
+
+-------------------------------------------------------------------
audit.changes: same change
Old:
----
audit-1.1.3-apparmor.patch
audit-1.1.3-disable-syscall-contexts.patch
audit-1.1.3-move-audisp.patch
audit-1.1.3-no-errormessage.patch
audit-1.1.3-no_python.patch
audit-1.1.3-warning-on-connrefused.patch
audit-1.1.3.tar.bz2
audit-fix-broken-kernels.patch
audit-fixes.patch
audit.no.__KERNEL__.patch
New:
----
README-BEFORE-ADDING-PATCHES
audit-1.2.6.tar.bz2
audit-auparse_missing_return.patch
audit-disable-syscall-contexts.patch
audit-move-audisp.patch
audit-no_kernelconfig.patch
audit-no_kernelconfig2.patch
audit-no_python.patch
audit-no_syscall_hdr.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ audit-libs-python.spec ++++++
--- /var/tmp/diff_new_pack.EuoEdo/_old 2006-09-01 01:21:33.000000000 +0200
+++ /var/tmp/diff_new_pack.EuoEdo/_new 2006-09-01 01:21:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package audit-libs-python (Version 1.1.3)
+# spec file for package audit-libs-python (Version 1.2.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,19 +14,18 @@
%define _name audit
BuildRequires: audit-devel gcc-c++ python-devel swig
Summary: Python bindings for libaudit
-Version: 1.1.3
-Release: 3
+Version: 1.2.6
+Release: 1
License: GPL
Group: System/Monitoring
URL: http://people.redhat.com/sgrubb/audit/
Source0: audit-%{version}.tar.bz2
-Patch0: %_name-%version-move-audisp.patch
-Patch1: %_name-fixes.patch
-Patch2: %_name-%version-apparmor.patch
-Patch3: %_name-fix-broken-kernels.patch
-Patch4: %_name-%version-warning-on-connrefused.patch
-Patch5: %_name-%version-no-errormessage.patch
-Patch6: %_name-%version-disable-syscall-contexts.patch
+Patch0: audit-move-audisp.patch
+Patch1: audit-disable-syscall-contexts.patch
+Patch2: audit-no_kernelconfig.patch
+Patch3: audit-no_kernelconfig2.patch
+Patch4: audit-no_syscall_hdr.patch
+Patch5: audit-auparse_missing_return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: audit-libs = %{version}-%{release}
PreReq: %insserv_prereq %fillup_prereq
@@ -49,7 +48,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%build
autoreconf -fv --install
@@ -72,5 +70,7 @@
/%{_libdir}/python%{py_ver}/site-packages/*
%changelog -n audit-libs-python
+* Thu Aug 31 2006 - tonyj(a)suse.de
+- Upgrade to 1.2.6-1
* Wed Aug 16 2006 - cthiel(a)suse.de
- split off package
++++++ audit.spec ++++++
--- /var/tmp/diff_new_pack.EuoEdo/_old 2006-09-01 01:21:33.000000000 +0200
+++ /var/tmp/diff_new_pack.EuoEdo/_new 2006-09-01 01:21:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package audit (Version 1.1.3)
+# spec file for package audit (Version 1.2.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,23 +13,21 @@
Name: audit
BuildRequires: gcc-c++
Summary: User Space Tools for 2.6 Kernel Auditing
-Version: 1.1.3
-Release: 25
+Version: 1.2.6
+Release: 1
License: GPL
Group: System/Monitoring
URL: http://people.redhat.com/sgrubb/audit/
Source0: %{name}-%{version}.tar.bz2
Source1: auditd.init
Source2: auditd.sysconfig
-Patch0: %name-%version-move-audisp.patch
-Patch1: %name-fixes.patch
-Patch2: %name-%version-apparmor.patch
-Patch3: %name-fix-broken-kernels.patch
-Patch4: %name-%version-warning-on-connrefused.patch
-Patch5: %name-%version-no-errormessage.patch
-Patch6: %name-%version-disable-syscall-contexts.patch
-Patch7: %name-%version-no_python.patch
-Patch8: audit.no.__KERNEL__.patch
+Patch0: audit-move-audisp.patch
+Patch1: audit-no_python.patch
+Patch2: audit-disable-syscall-contexts.patch
+Patch3: audit-no_kernelconfig.patch
+Patch4: audit-no_kernelconfig2.patch
+Patch5: audit-no_syscall_hdr.patch
+Patch6: audit-auparse_missing_return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-libs = %{version}-%{release}
PreReq: %insserv_prereq %fillup_prereq
@@ -86,14 +84,12 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7
-%patch8 -p1
%build
autoreconf -fv --install
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
-./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc
+./configure --prefix=%{_prefix} --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib} --sysconfdir=/etc --with-apparmor
pushd src/mt
make libaudit.h
popd
@@ -112,10 +108,11 @@
# We manually install this since Makefile doesn't
install -m 0644 lib/libaudit.h $RPM_BUILD_ROOT/%{_includedir}
# This winds up in the wrong place when libtool is involved
-rm $RPM_BUILD_ROOT/%{_lib}/libaudit.so
+rm $RPM_BUILD_ROOT/%{_lib}/libaudit.so $RPM_BUILD_ROOT/%{_lib}/libauparse.so
ln -sf /%{_lib}/libaudit.so.0 $RPM_BUILD_ROOT%{_libdir}/libaudit.so
-mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir}
-rm $RPM_BUILD_ROOT/%{_lib}/libaudit.la
+ln -sf /%{_lib}/libauparse.so.0 $RPM_BUILD_ROOT%{_libdir}/libauparse.so
+mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir}
+rm $RPM_BUILD_ROOT/%{_lib}/libaudit.la $RPM_BUILD_ROOT/%{_lib}/libauparse.la
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.auditd
# delete redhat script, use ours
@@ -126,6 +123,10 @@
ln -s /etc/init.d/auditd $RPM_BUILD_ROOT/sbin/rcauditd
mkdir -p $RPM_BUILD_ROOT/var/log/audit/
touch $RPM_BUILD_ROOT/var/log/audit/audit.log
+# don't use /etc/audit
+mv $RPM_BUILD_ROOT/etc/audit/auditd.conf $RPM_BUILD_ROOT/etc/auditd.conf
+mv $RPM_BUILD_ROOT/etc/audit/audit.rules $RPM_BUILD_ROOT/etc/audit.rules
+rm -rf $RPM_BUILD_ROOT/etc/audit
%clean
rm -rf $RPM_BUILD_ROOT
@@ -147,10 +148,13 @@
%files libs
%defattr(-,root,root)
/%{_lib}/libaudit.*
+/%{_lib}/libauparse.*
+%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
%files devel
%defattr(-,root,root)
%{_libdir}/libaudit.*
+%{_libdir}/libauparse.*
%{_includedir}/libaudit.h
%{_mandir}/man3/*
@@ -173,6 +177,8 @@
%ghost /var/log/audit/audit.log
%changelog -n audit
+* Thu Aug 31 2006 - tonyj(a)suse.de
+- Upgrade to 1.2.6-1
* Sat Aug 26 2006 - olh(a)suse.de
- do not define __KERNEL__ in userland apps
- remove unused sys/syscall.h include
++++++ audit-1.1.3.tar.bz2 -> audit-1.2.6.tar.bz2 ++++++
++++ 20763 lines of diff (skipped)
++++++ audit-auparse_missing_return.patch ++++++
From: tonyj(a)suse.de
References: none
Patch-upstream: no
Disable unused functions which are tripping the abuild garbage return code
detection.
--- audit-1.2.6/auparse/auparse.c.xx 2006-08-31 21:24:46.000000000 +0200
+++ audit-1.2.6/auparse/auparse.c 2006-08-31 21:30:48.000000000 +0200
@@ -177,6 +177,7 @@
}
+#if 0
time_t auparse_get_time(auparse_state_t *au)
{
}
@@ -190,6 +191,7 @@
unsigned long auparse_get_serial(auparse_state_t *au)
{
}
+#endif /* not used, disable to avoid abuild garbage return error */
const char *auparse_get_node(auparse_state_t *au)
@@ -198,9 +200,11 @@
}
+#if 0
int auparse_timestamp_compare(event_t *e1, event_t *e2)
{
}
+#endif /* not used, disable to avoid abuild garbage return error */
/* Functions that traverse records in the same event */
@@ -260,9 +264,11 @@
}
+#if 0
int auparse_get_field_int(auparse_state_t *au)
{
}
+#endif /* not used, disable to avoid abuild garbage return error */
const char *auparse_interpret_field(auparse_state_t *au)
++++++ audit-disable-syscall-contexts.patch ++++++
From: sbeattie(a)suse.de
References: 172154
Upstream: no
Disable syscall audit context creation by default.
This patch needs to be reevaluated in light of kernel performance improvements
to audit comitted around ~2.6.18
--- audit-1.2.6/src/auditd.c.xx 2006-07-27 19:06:08.000000000 +0200
+++ audit-1.2.6/src/auditd.c 2006-08-31 20:02:57.000000000 +0200
@@ -36,6 +36,7 @@
#include <sys/wait.h>
#include <fcntl.h>
#include <pthread.h>
+#include <getopt.h>
#include "libaudit.h"
#include "auditd-config.h"
@@ -69,7 +70,7 @@
*/
static void usage(void)
{
- puts("Usage: auditd [ -f ]");
+ puts("Usage: auditd [ -f ] [ -n ]");
exit(2);
}
@@ -281,18 +282,28 @@
struct rlimit limit;
int hup_info_requested = 0, usr1_info_requested = 0;
int i;
+ int opt_foreground = 0;
+ int opt_enabled = 1;
+ int c;
/* Get params && set mode */
- if (argc > 2)
- usage();
- if (argc == 2) {
- if (strcmp(argv[1], "-f") == 0) {
- config.daemonize = D_FOREGROUND;
- set_aumessage_mode(MSG_STDERR, DBG_YES);
- } else
+ while ((c = getopt(argc, argv, "fn")) != -1) {
+ switch (c) {
+ case 'f':
+ opt_foreground = 1;
+ break;
+ case 'n':
+ opt_enabled = 0;
+ break;
+ default:
usage();
+ }
}
- else {
+
+ if (opt_foreground) {
+ config.daemonize = D_FOREGROUND;
+ set_aumessage_mode(MSG_STDERR, DBG_YES);
+ } else {
config.daemonize = D_BACKGROUND;
set_aumessage_mode(MSG_SYSLOG, DBG_NO);
(void) umask( umask( 077 ) | 022 );
@@ -429,7 +440,7 @@
tell_parent(SUCCESS);
/* Enable auditing just in case it was off */
- if (audit_set_enabled(fd, 1) < 0) {
+ if (audit_set_enabled(fd, opt_enabled) < 0) {
char emsg[128];
snprintf(emsg, sizeof(emsg),
"auditd error halt, auid=%u pid=%d res=failed",
@@ -558,6 +569,7 @@
/* Write message to log that we are going down */
int rc;
+ audit_set_enabled(fd, 0);
rc = audit_request_signal_info(fd);
if (rc > 0) {
struct audit_reply trep;
--- audit-1.2.6/docs/auditd.8.xx 2006-04-06 23:21:14.000000000 +0200
+++ audit-1.2.6/docs/auditd.8 2006-08-31 20:02:47.000000000 +0200
@@ -4,6 +4,7 @@
.SH SYNOPSIS
.B auditd
[ \fI-f \fR]
+[ \fI-n \fR]
.SH DESCRIPTION
auditd is the userspace component to the Linux Auditing System. It's responsible for writing audit records to the disk. Viewing the logs is done with the
.B ausearch
@@ -18,6 +19,10 @@
.TP
\fB\-f\fR
leave the audit daemon in the foreground for debugging. Messages also go to stderr rather than the audit log.
+.TP
+\fB-n\fR
+start the audit daemon, but do not enabled system call auditing in the kernel.
+This can be done separately by using \fBauditctl -e\fR.
.SH SIGNALS
\fB\SIGHUP\fR
causes auditd to reconfigure. This means that auditd re-reads the configuration file. If there are no syntax errors, it will proceed to implement the requested changes. If the reconfigure is successful, a DAEMON_CONFIG event is recorded in the logs. If not successful, error handling is controlled by space_left_action, admin_space_left_action, disk_full_action, and disk_error_action parameters in auditd.conf.
++++++ audit-move-audisp.patch ++++++
From: tonyj(a)suse.de
References: unknown
Upstream: no
Since libstdc++ is in /usr, audispd must move also
--- audit-1.2.6/init.d/auditd.conf.xx 2006-08-31 18:18:11.000000000 +0200
+++ audit-1.2.6/init.d/auditd.conf 2006-08-31 18:19:00.000000000 +0200
@@ -8,7 +8,7 @@
flush = INCREMENTAL
freq = 20
num_logs = 4
-dispatcher = /sbin/audispd
+dispatcher = /usr/sbin/audispd
DISP_qos = lossy
max_log_file = 5
max_log_file_action = ROTATE
++++++ audit-no_kernelconfig.patch ++++++
From: meissner(a)suse.de
Date: Mon Mar 6 14:21:06 CET 2006
References: 152733
Upstream: unknown
Do not output diagnostics to stderr on auditd startup if kernel has no audit
support (kernel returns ECONNREFUSED).
--- audit-1.2.6/src/auditctl.c.xx 2006-08-31 19:33:20.000000000 +0200
+++ audit-1.2.6/src/auditctl.c 2006-08-31 19:34:18.000000000 +0200
@@ -848,9 +848,11 @@
/* handle reply or send rule */
if (rc != -3) {
if (handle_request(rc) == -1) {
- fprintf(stderr,
- "There was an error in line %d of %s\n",
- lineno, file);
+ /* audit not compiled into kernel. */
+ if (errno != ECONNREFUSED)
+ fprintf(stderr,
+ "There was an error in line %d of %s\n",
+ lineno, file);
if (!ignore) {
fclose(f);
return -1;
++++++ audit-no_kernelconfig2.patch ++++++
From: meissner(a)suse.de
Date: Mon Mar 6 14:21:06 CET 2006
References: 152733
Upstream: unknown
Demote messages to debug if kernel does not include audit support.
--- audit-1.2.6/lib/libaudit.c.xx 2006-08-26 19:37:26.000000000 +0200
+++ audit-1.2.6/lib/libaudit.c 2006-08-31 19:54:51.000000000 +0200
@@ -89,20 +89,21 @@
{ NULL, NULL }
};
+/* If they've compiled their own kernel and did not include
+ * the audit susbsystem, they will get ECONNREFUSED. We'll
+ * demote the message to debug so its not lost entirely. */
+static int _get_warnprio(int xerrno) {
+ if (xerrno == ECONNREFUSED)
+ return LOG_DEBUG;
+ else
+ return LOG_WARNING;
+}
int audit_request_status(int fd)
{
int rc = audit_send(fd, AUDIT_GET, NULL, 0);
if (rc < 0) {
- /* If they've compiled their own kernel and did not include
- * the audit susbsystem, they will get ECONNREFUSED. We'll
- * demote the message to debug so its not lost entirely. */
- int priority;
- if (errno == ECONNREFUSED)
- priority = LOG_DEBUG;
- else
- priority = LOG_WARNING;
- audit_msg(priority, "Error sending status request (%s)",
+ audit_msg(_get_warnprio(errno), "Error sending status request (%s)",
strerror(-rc));
}
return rc;
@@ -330,7 +331,7 @@
s.enabled = enabled;
rc = audit_send(fd, AUDIT_SET, &s, sizeof(s));
if (rc < 0)
- audit_msg(LOG_WARNING, "Error sending enable request (%s)",
+ audit_msg(_get_warnprio(errno), "Error sending enable request (%s)",
strerror(-rc));
return rc;
}
@@ -403,7 +404,7 @@
s.failure = failure;
rc = audit_send(fd, AUDIT_SET, &s, sizeof(s));
if (rc < 0)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending failure mode request (%s)",
strerror(-rc));
return rc;
@@ -424,7 +425,7 @@
s.pid = pid;
rc = audit_send(fd, AUDIT_SET, &s, sizeof(s));
if (rc < 0) {
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending failure mode request (%s)",
strerror(-rc));
return rc;
@@ -456,7 +457,7 @@
s.rate_limit = limit;
rc = audit_send(fd, AUDIT_SET, &s, sizeof(s));
if (rc < 0)
- audit_msg(LOG_WARNING, "Error sending rate limit request (%s)",
+ audit_msg(_get_warnprio(errno), "Error sending rate limit request (%s)",
strerror(-rc));
return rc;
}
@@ -471,7 +472,7 @@
s.backlog_limit = limit;
rc = audit_send(fd, AUDIT_SET, &s, sizeof(s));
if (rc < 0)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending backlog limit request (%s)",
strerror(-rc));
return rc;
@@ -481,7 +482,7 @@
{
int rc = audit_send(fd, AUDIT_LIST, NULL, 0);
if (rc < 0)
- audit_msg(LOG_WARNING, "Error sending rule list request (%s)",
+ audit_msg(_get_warnprio(errno), "Error sending rule list request (%s)",
strerror(-rc));
return rc;
}
@@ -490,7 +491,7 @@
{
int rc = audit_send(fd, AUDIT_LIST_RULES, NULL, 0);
if (rc < 0 && rc != -EINVAL)
- audit_msg(LOG_WARNING, "Error sending rule list request (%s)",
+ audit_msg(_get_warnprio(errno), "Error sending rule list request (%s)",
strerror(-rc));
return rc;
}
@@ -499,7 +500,7 @@
{
int rc = audit_send(fd, AUDIT_SIGNAL_INFO, NULL, 0);
if (rc < 0)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending signal_info request (%s)",
strerror(-rc));
return rc;
@@ -593,7 +594,7 @@
rule->action = action;
rc = audit_send(fd, AUDIT_ADD, rule, sizeof(struct audit_rule));
if (rc < 0)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending add rule request (%s)",
errno == EEXIST ?
"Rule exists" : strerror(-rc));
@@ -610,7 +611,7 @@
rc = audit_send(fd, AUDIT_ADD_RULE, rule,
sizeof(struct audit_rule_data) + rule->buflen);
if (rc < 0)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending add rule request (%s)",
errno == EEXIST ?
"Rule exists" : strerror(-rc));
@@ -626,10 +627,10 @@
rc = audit_send(fd, AUDIT_DEL, rule, sizeof(struct audit_rule));
if (rc < 0) {
if (rc == -ENOENT)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending delete rule request (No rule matches)");
else
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending delete rule request (%s)",
strerror(-rc));
}
@@ -647,10 +648,10 @@
sizeof(struct audit_rule_data) + rule->buflen);
if (rc < 0) {
if (rc == -ENOENT)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending delete rule request (No rule matches)");
else
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending delete rule request (%s)",
strerror(-rc));
}
@@ -726,7 +727,7 @@
if (fd >= 0) {
int rc = audit_send(fd, type, message, strlen(message)+1);
if (rc < 0)
- audit_msg(LOG_WARNING,
+ audit_msg(_get_warnprio(errno),
"Error sending user message request (%s)",
strerror(-rc));
return rc;
++++++ audit-no_python.patch ++++++
From: tonyj(a)suse.de
Date: unknown
Upstream: no
This patch is used by audit.spec to disable use of Python.
Necessary Python files are built seperately by audit-libs-python.spec
--- audit-1.2.6/audisp/Makefile.xx 2006-08-31 20:53:16.000000000 +0200
+++ audit-1.2.6/audisp/Makefile 2006-08-31 20:54:23.000000000 +0200
@@ -1,8 +1,6 @@
# Installation directories.
PREFIX ?= $(DESTDIR)/usr
-LIBDIR ?= $(PREFIX)/lib/python2.4/site-packages
SBINDIR ?= $(DESTDIR)/sbin
-LIB=AuditMsg.py
TARGETS=audispd
@@ -12,7 +10,6 @@
-mkdir -p $(SBINDIR)
-mkdir -p $(LIBDIR)
install -m 755 $(TARGETS) $(SBINDIR)
- install -m 644 $(LIB) $(LIBDIR)
distclean:
clean:
--- audit-1.2.6/configure.ac.xx 2006-07-13 23:02:17.000000000 +0200
+++ audit-1.2.6/configure.ac 2006-08-31 20:52:49.000000000 +0200
@@ -39,7 +39,7 @@
AM_INIT_AUTOMAKE
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
-AM_PATH_PYTHON(2.4)
+#AM_PATH_PYTHON(2.4)
echo .
echo Checking for programs
@@ -105,7 +105,8 @@
if test x$use_apparmor != xno ; then
AC_DEFINE(WITH_APPARMOR,1,[Define if you want to enable AppArmor events.])fi
-AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile)
+#AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile)
+AC_OUTPUT(Makefile lib/Makefile auparse/Makefile src/Makefile src/mt/Makefile docs/Makefile init.d/Makefile)
echo .
echo "
--- audit-1.2.6/Makefile.am.xx 2006-07-13 22:24:35.000000000 +0200
+++ audit-1.2.6/Makefile.am 2006-08-31 20:52:49.000000000 +0200
@@ -22,7 +22,8 @@
#
#SUBDIRS = lib auparse src/mt src audisp audisp/tests swig init.d docs
-SUBDIRS = lib auparse src/mt src audisp swig init.d docs
+#SUBDIRS = lib auparse src/mt src audisp swig init.d docs
+SUBDIRS = lib auparse src/mt src audisp init.d docs
EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules contrib/capp.rules contrib/lspp.rules contrib/skeleton.c README-install audit.spec
CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure debug*.list config/*
++++++ audit-no_syscall_hdr.patch ++++++
From: olh(a)suse.de
Date: Sat Aug 26 09:01:50 CEST 2006
References: unknown
Upstream: unknown
Remove unused/invalid sys/syscall.h include
--- audit-1.2.6/lib/lookup_table.c.xx 2006-08-31 19:58:28.000000000 +0200
+++ audit-1.2.6/lib/lookup_table.c 2006-08-31 19:58:36.000000000 +0200
@@ -29,7 +29,6 @@
#include "libaudit.h"
#include "private.h"
-#include <sys/syscall.h>
struct transtab {
int value;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package apache2
checked in at Fri Sep 1 01:20:39 CEST 2006.
--------
--- apache2/apache2.changes 2006-08-29 16:34:08.000000000 +0200
+++ apache2/apache2.changes 2006-08-31 15:27:02.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 15:26:54 CEST 2006 - poeml(a)suse.de
+
+- Enable fatal exception hook for use by diagnostic modules.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.PNuDl2/_old 2006-09-01 01:20:10.000000000 +0200
+++ /var/tmp/diff_new_pack.PNuDl2/_new 2006-09-01 01:20:10.000000000 +0200
@@ -53,7 +53,7 @@
Group: Productivity/Networking/Web/Servers
%define realver 2.2.3
Version: 2.2.3
-Release: 1
+Release: 2
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
Source10: SUSE-NOTICE
@@ -334,6 +334,8 @@
%endif
%endif
\
+ --enable-exception-hook \
+ \
%if %{?suse_version:%suse_version}%{?!suse_version:9999} > 930
--with-pcre \
--enable-pie \
@@ -1003,6 +1005,8 @@
fi
%changelog -n apache2
+* Thu Aug 31 2006 - poeml(a)suse.de
+- Enable fatal exception hook for use by diagnostic modules.
* Tue Aug 29 2006 - poeml(a)suse.de
- move some binaries, where calling by users makes sense (dbmmanage
htdbm htdigest htpasswd), from /usr/sbin to /usr/bin [#140133]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-firstboot
checked in at Fri Sep 1 01:20:19 CEST 2006.
--------
--- yast2-firstboot/yast2-firstboot.changes 2006-06-02 11:06:19.000000000 +0200
+++ yast2-firstboot/yast2-firstboot.changes 2006-08-31 09:28:44.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Aug 31 08:56:27 CEST 2006 - lslezak(a)suse.cz
+
+- the control file has been updated to the default
+ workflow (#200718)
+- added missing documentation files (#189358)
+- 2.13.3
+
+-------------------------------------------------------------------
+Tue Aug 1 13:34:34 CEST 2006 - jsrain(a)suse.cz
+
+- updated the documentation (#189358)
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-2.13.2.tar.bz2
New:
----
yast2-firstboot-2.13.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.7j73Mw/_old 2006-09-01 01:20:14.000000000 +0200
+++ /var/tmp/diff_new_pack.7j73Mw/_new 2006-09-01 01:20:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firstboot (Version 2.13.2)
+# spec file for package yast2-firstboot (Version 2.13.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,14 +12,14 @@
Name: yast2-firstboot
URL: http://www.suse.com/
-Version: 2.13.2
+Version: 2.13.3
Release: 1
License: X11/MIT, GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firstboot-2.13.2.tar.bz2
+Source0: yast2-firstboot-2.13.3.tar.bz2
prefix: /usr
-BuildRequires: update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml
+BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml
Requires: yast2
BuildArchitectures: noarch
Summary: YaST Initial System Configuration
@@ -43,7 +43,7 @@
Anas Nashif<nashif(a)suse.de>
%prep
-%setup -n yast2-firstboot-2.13.2
+%setup -n yast2-firstboot-2.13.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,6 +92,13 @@
/etc/YaST2/*.xml
%changelog -n yast2-firstboot
+* Thu Aug 31 2006 - lslezak(a)suse.cz
+- the control file has been updated to the default
+ workflow (#200718)
+- added missing documentation files (#189358)
+- 2.13.3
+* Tue Aug 01 2006 - jsrain(a)suse.cz
+- updated the documentation (#189358)
* Fri Jun 02 2006 - jsrain(a)suse.cz
- log Report messages by default (#180862)
- 2.13.2
++++++ yast2-firstboot-2.13.2.tar.bz2 -> yast2-firstboot-2.13.3.tar.bz2 ++++++
++++ 2202 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/VERSION new/yast2-firstboot-2.13.3/VERSION
--- old/yast2-firstboot-2.13.2/VERSION 2006-06-02 11:00:41.000000000 +0200
+++ new/yast2-firstboot-2.13.3/VERSION 2006-08-31 09:12:17.000000000 +0200
@@ -1 +1 @@
-2.13.2
+2.13.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/configure.in new/yast2-firstboot-2.13.3/configure.in
--- old/yast2-firstboot-2.13.2/configure.in 2006-06-02 11:05:20.000000000 +0200
+++ new/yast2-firstboot-2.13.3/configure.in 2006-08-31 09:12:21.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-firstboot
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firstboot, 2.13.2, http://bugs.opensuse.org/, yast2-firstboot)
+AC_INIT(yast2-firstboot, 2.13.3, http://bugs.opensuse.org/, yast2-firstboot)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.2"
+VERSION="2.13.3"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -144,9 +144,12 @@
fi
+AX_CHECK_DOCBOOK
+
( cd src/control; ln -sf firstboot.xml firstboot.glade )
AC_CONFIG_FILES(Makefile agents/Makefile
+doc/autodocs/Makefile
doc/Makefile
scripts/Firstboot-Stage/Makefile
scripts/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/configure.in.in new/yast2-firstboot-2.13.3/configure.in.in
--- old/yast2-firstboot-2.13.2/configure.in.in 2005-01-24 07:42:47.000000000 +0100
+++ new/yast2-firstboot-2.13.3/configure.in.in 2006-08-30 13:27:48.000000000 +0200
@@ -8,6 +8,8 @@
@YAST2-CHECKS-COMMON@
@YAST2-CHECKS-YCP@
+AX_CHECK_DOCBOOK
+
## Nasty hack: xgettext doesn't work for XML files, so let's symlink it
( cd src/control; ln -sf firstboot.xml firstboot.glade )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/doc/Makefile.am new/yast2-firstboot-2.13.3/doc/Makefile.am
--- old/yast2-firstboot-2.13.2/doc/Makefile.am 2005-01-24 07:42:47.000000000 +0100
+++ new/yast2-firstboot-2.13.3/doc/Makefile.am 2006-08-30 14:46:07.000000000 +0200
@@ -1,43 +1,42 @@
#
-# Makefile.am
+# Makefile.am doc subdir
#
-STYLESHEET_FO=$(ydatadir)/docbook/stylesheets/customize-fo.xsl
-STYLESHEET_HTML=$(ydatadir)/docbook/stylesheets/customize-html.xsl
-COMPONENT=firstboot-doc
-htmldir = $(docdir)/$(COMPONENT)
+SUBDIRS = autodocs
+htmldir = $(docdir)
+xml_files = $(wildcard *.xml)
-html: html/index.html html/susebooks.css
+html_DATA = $(wildcard html/*.html) \
+ html/index.html \
+ html/yast2docs.css
-pdf: clean.xml $(COMPONENT).pdf
+pdf: firstboot.pdf
-validate:
- xmllint --xinclude --valid --noout $(COMPONENT).xml
+html/index.html: firstboot-doc.xml
+ XML_CATALOG_FILES=@XML_CATALOG@ \
+ @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
+ @STYLESHEET_HTML@ $<
-$(COMPONENT).fo: $(COMPONENT).xml
- xsltproc --xinclude -o $(COMPONENT).fo $(STYLESHEET_FO) $(COMPONENT).xml
+firstboot.fo: firstboot-doc.xml
+ XML_CATALOG_FILES=@XML_CATALOG@ \
+ @XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
+ -o $@ @STYLESHEET_PDF@ $<
-$(COMPONENT).pdf: $(COMPONENT).fo
- fop -q $(COMPONENT).fo $(COMPONENT).pdf
+firstboot.pdf: firstboot.fo
+ fop -q $< $@
+html/yast2docs.css: html/index.html
+ cp @STYLESHEET_CSS@ html
+ cp -a `pkg-config --variable=yast2dir yast2-devtools`/data/docbook/images html
-html/susebooks.css:
- cp $(ydatadir)/docbook/css/susebooks.css html
- cp -a $(ydatadir)/docbook/images html
+EXTRA_DIST = $(xml_files)
-clean.xml: firstboot-section.xml
- xmllint --xinclude --noent --dropdtd -o $@ $<
- cp $@ firstboot-section_mod.xml
-
+CLEANFILES = $(html_DATA)
-html/index.html: clean.xml
- xsltproc --xinclude $(STYLESHEET_HTML) $(COMPONENT).xml
-
-html_DATA = $(wildcard html/*)
-
-EXTRA_DIST = *.xml $(html_DATA)
+clean-local:
+ rm -rf html
-CLEANFILES = CATALOG.local *.out *.aux *.dvi *.tex *.ps *.pdf *.log *.dsl *.fo clean.xml
+install-data-local:
+ mkdir -p $(DESTDIR)$(htmldir)
+ cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir)
-clean-local:
- rm -rf html/*.html
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/doc/README new/yast2-firstboot-2.13.3/doc/README
--- old/yast2-firstboot-2.13.2/doc/README 2005-01-24 07:42:47.000000000 +0100
+++ new/yast2-firstboot-2.13.3/doc/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-Intro
------
-
-Using firstboot, an administrative user can configure the system (before creation
-of the install image) such that on first boot after configuration, the
-system owner is prompted for various items to personalize the system.
-
-When the machine boots for the first time after the installation, you will be
-presented with an interface for doing some additional configuration.
-
-The default workflow for such an interface is:
-
-1. The Welcome screen
-2. The License Agreement
-3. Date & Time
-4. Root Password
-5. User Account
-6. Finish
-
-
-During firstboot, 2 additional dialogs are shown for writing the data and
-running SuSEconfig which require no user interaction.
-
-
-Enabling firstboot
-------------------
-
-
-Firstboot is disabled by default. the package yast2-firstboot is not part of
-any software selection and has to be installed individually.
-
-After the package is installed, the following has to be done to activate it
-during the next boot:
-
-1. Touch the file /etc/reconfig_system
-2. Enable the service firstboot using the YaST runlevel editor or
- directly on the command line with
-
- chkconfig firstboot on
-
-
-The Post Configuration Utility (firstboot) expects the X server to be
-configured. If no X server is configured, then it will start in text mode
-automatically.
-
-
-
-
-Customizing YaST firstboot
---------------------------
-
-The utility has standard and translated texts in the default setup. If the
-administrative user wishes to change those texts, it is possible using the
-firstboot configuration file: /etc/sysconfig/firstboot
-
-This file allows changing the text of the following dialogs:
-
-- Welcome Screen
-- License Agreement
-- Finish Dialog
-
-
-Changing the values of the respective variables to a full path of a plain or
-rich text formatted text file, will result in the dialogs with a customized
-text.
-If the referenced files are in plain text, they will be shown as such
-automatically. If they contain any markup language, they will be formatted as
-richtext.
-
-
-
-Scripting
------------
-
-
-The administrative user can add scripts to be executed at the end of the
-firstboot configuration to customize the system depending on user input or
-depending on the environment of the machine. Any scripts should go to
-
- /usr/share/firstboot/scripts
-
-or to a custom location that can be set using /etc/sysconfig/firstboot.
-
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/doc/autodocs/Makefile.am new/yast2-firstboot-2.13.3/doc/autodocs/Makefile.am
--- old/yast2-firstboot-2.13.2/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-firstboot-2.13.3/doc/autodocs/Makefile.am 2006-06-29 08:54:08.000000000 +0200
@@ -0,0 +1,10 @@
+# Makefile.am for firstboot/doc/autodocs
+
+htmldir = $(docdir)/autodocs
+
+index.html: $(srcdir)/../../src/*.ycp
+ $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
+
+html_DATA = index.html $(wildcard *.html)
+
+CLEANFILES = $(html_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/doc/firstboot-section.xml new/yast2-firstboot-2.13.3/doc/firstboot-section.xml
--- old/yast2-firstboot-2.13.2/doc/firstboot-section.xml 2005-06-02 15:02:56.000000000 +0200
+++ new/yast2-firstboot-2.13.3/doc/firstboot-section.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <section>
- <title>Firstboot Configuration</title>
- <para>The YaST firstboot utility (YaST Initial System Configuration), which
- runs after the installation is completed, lets you configure the Novell
- Linux Desktop system before creation of the install image so that on the
- first boot after configuration, users are guided through a series of
- steps that allow for easier configuration of their desktops. YaST
- firstboot does not run by default and has to be configured to run by the
- user or the system administrator. It is useful for image deployments
- where the system in the image is completely configured. However, some
- final steps such as root password and user logins have to be created to
- personalize the system.
- </para>
-
- <para>The default workflow for the interface is as follows: </para>
- <orderedlist>
- <listitem>
- <para>The Welcome screen </para>
- </listitem>
- <listitem>
- <para>The License Agreement</para>
- </listitem>
- <listitem>
- <para>Date & Time</para>
- </listitem>
- <listitem>
- <para>Network</para>
- </listitem>
- <listitem>
- <para>Root Password</para>
- </listitem>
- <listitem>
- <para>User Account</para>
- </listitem>
- <listitem>
- <para>Hardware</para>
- </listitem>
- <listitem>
- <para>Finish</para>
- </listitem>
- </orderedlist>
-
- <para>During firstboot, two additional dialogs are shown for writing the data and running SuSEconfig which require no user interaction.</para>
- <section>
- <title>Enabling Firstboot</title>
- <para>Firstboot is disabled by default. The yast2-firstboot package is not part of any software selection and has to be installed individually. During the Installation, click Software in the Installation Settings screen, then select the yast2-firstboot package in the Rest selection list. </para>
- <orderedlist>
- <listitem>
- <para>Install the product on a master box, making sure that you install the firstboot package.</para>
- </listitem>
- <listitem>
- <para>Create the empty file <filename>/etc/reconfig_system</filename>. This file will be deleted when firstboot configuration is completed. This can be done by issuing the commnd: <command>touch /etc/reconfig_system</command>
-</para>
- </listitem>
- <listitem>
- <para>Enable the firstboot service using the YaST runlevel editor, or
- directly on the command line using the following command:
- <command>chkconfig firstboot on</command>
-</para>
- </listitem>
- </orderedlist>
- <para>When the system comes up after a shutdown, the firstboot
- configuration utility will be started and the user will be presented
- with the configuration screens.</para>
-
- <para>There are different ways the firstboot configuration utility can be
- used, one of them for creating installation images. The following step
- by step description shows how an image can be created after firstboot
- has been enabled.</para>
-
- <orderedlist>
- <listitem>
- <para>Boot the master box using the rescue boot option.</para>
- </listitem>
- <listitem>
- <para>Configure network in the rescue system.</para>
- </listitem>
- <listitem>
- <para>Mount an NFS exported directory to /mnt.</para>
- </listitem>
- <listitem>
- <para>Run <command>dd if=/dev/hda of=/mnt/image.bin
- count=4000000</command> to store the master box's hard disk image
- onto the NFS server.</para>
-
- </listitem>
- </orderedlist>
- <para>And to install the image you have just created:</para>
- <orderedlist>
- <listitem>
- <para>Boot a user's machine using the rescue boot option.</para>
- </listitem>
- <listitem>
- <para>Configure network in the rescue system.</para>
- </listitem>
- <listitem>
- <para>Mount the NFS exported directory to /mnt.</para>
- </listitem>
- <listitem>
- <para>Run <command>dd if=/mnt/image.bin of=/dev/hda count=4000000.</command>
-</para>
- </listitem>
- <listitem>
- <para>Remove the boot media and boot the user's machine. </para>
- </listitem>
- <listitem>
- <para>After firstboot comes up, configure the date and time, root password, and user account and any other additional settings. </para>
- </listitem>
- </orderedlist>
- <para>The Post Configuration Utility (firstboot) expects the X server to be configured. If no X server is configured, it will automatically start in text mode.</para>
- </section>
- <section>
- <title>Customizing YaST Firstboot</title>
- <section>
- <title>Customizing Messages</title>
- <para>The utility has standard and translated texts in the default
- setup. If you want to change those texts, use the firstboot
- configuration file,<filename>/etc/sysconfig/firstboot</filename>.</para>
-
- <para>This file lets you change the text of the following dialogs:</para>
- <itemizedlist>
- <listitem>
- <para>Welcome screen</para>
- </listitem>
- <listitem>
- <para>License Agreement</para>
- </listitem>
- <listitem>
- <para>Finish dialog </para>
- </listitem>
- </itemizedlist>
- <para>To do this, change the values of the respective variables
- (FIRSTBOOT_WELCOME_FILE,FIRSTBOOT_LICENSE_FILE , and
- FIRSTBOOT_FINISH_FILE) to the full path of a plain or rich text
- formatted text file. This will give you dialogs with customized
- text. If the references files are in plain text, they will be shown
- as such automatically. If they contain any markup language, they will
- be formatted as rich text.</para>
-
- <para>The default license text shown is taken from the file
- <filename>/var/lib/YaST2/info.txt</filename> which is the EULA of the
- product being installed.</para>
-
- </section>
- <section>
- <title>License Action</title>
- <para>The variable LICENSE_REFUSAL_ACTION sets the action to be
- executed if the user does not accept the license. The following
- options are available:</para>
-
- <itemizedlist>
- <listitem>
- <para>halt: system is halted (shut down)</para>
- </listitem>
- <listitem>
- <para>continue: continue with configuration</para>
- </listitem>
- <listitem>
- <para>abort: Abort firstboot configuration utility and continue with the boot process.</para>
- </listitem>
- </itemizedlist>
- </section>
- <section>
- <title>Release Notes</title>
- <para>Use the configuration option FIRSTBOOT_RELEASE_NOTES_PATH to show
- release notes in the target language. The value of the option should
- be a path to a directory with files using language dependent naming
- (<filename>RELEASE-NOTES.{language}.rtf</filename>). For english, the
- following file will be needed: RELEASE-NOTES.{language}.rtf.</para>
-
- <para>
- The original release notes for the installed product availabe in <filename>/usr/share/doc/release-notes</filename> can be used as an
- example.
- </para>
-
- </section>
- <section>
- <title>Customizing Workflow Components</title>
-
- <para>The default firstboot workflow can be controled using one single
- file which is a subset of the control.xml file used to control the
- complete installation. The firstboot control file consists of
- workflow and proposal configurations and can be used to add or remove
- configuration screens depending on the end configuration of the
- system. The file firstboot.xml is installed with the yast2-firstboot
- package and can be found at the following location:
- <filename>/usr/share/YaST2/control/firstboot.xml</filename>.</para>
-
- <para>This file can be modified to match the post installation
- requirements of the product in question. In addition to the default
- and pre-installed components, custom screens can be added to enable
- maximal flexiblity during post installation. For more information
- about the syntax of the control file, see the document titled
- “Product Installation Control”.</para>
-
- </section>
- </section>
- <section>
- <title>Scripting</title>
- <para>You can add scripts to be executed at the end of the firstboot
- configuration to customize the system depending on user input or the
- environment of the machine. Scripts should be placed in
- <filename>/usr/share/firstboot/scripts</filename> or in a custom
- location that can be set using the
- <filename>/etc/sysconfig/firstboot</filename> configuration
- file.</para>
-
-
-
- </section>
- </section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/doc/firstboot-section_mod.xml new/yast2-firstboot-2.13.3/doc/firstboot-section_mod.xml
--- old/yast2-firstboot-2.13.2/doc/firstboot-section_mod.xml 2005-06-02 15:02:56.000000000 +0200
+++ new/yast2-firstboot-2.13.3/doc/firstboot-section_mod.xml 2006-08-31 08:44:22.000000000 +0200
@@ -47,7 +47,7 @@
<para>Firstboot is disabled by default. The yast2-firstboot package is not part of any software selection and has to be installed individually. During the Installation, click Software in the Installation Settings screen, then select the yast2-firstboot package in the Rest selection list. </para>
<orderedlist>
<listitem>
- <para>Install the product on a master box, making sure that you install the firstboot package.</para>
+ <para>Install the product on a master box, making sure that you install the firstboot package. Configure whole system including system services, hardware components,...</para>
</listitem>
<listitem>
<para>Create the empty file <filename>/etc/reconfig_system</filename>. This file will be deleted when firstboot configuration is completed. This can be done by issuing the commnd: <command>touch /etc/reconfig_system</command>
@@ -60,7 +60,9 @@
</para>
</listitem>
</orderedlist>
- <para>When the system comes up after a shutdown, the firstboot
+ <para>After getting the system installed and prepared, shut it down and
+ clone the hard disk to hard disk to all of the machines.</para>
+ <para>When the system comes up after a shutdown and cloning, the firstboot
configuration utility will be started and the user will be presented
with the configuration screens.</para>
@@ -185,14 +187,17 @@
configuration screens depending on the end configuration of the
system. The file firstboot.xml is installed with the yast2-firstboot
package and can be found at the following location:
- <filename>/usr/share/YaST2/control/firstboot.xml</filename>.</para>
+ <filename>/etc/YaST2/firstboot.xml</filename>.</para>
<para>This file can be modified to match the post installation
requirements of the product in question. In addition to the default
and pre-installed components, custom screens can be added to enable
- maximal flexiblity during post installation. For more information
+ maximal flexiblity during post installation.
+<!-- For more information
about the syntax of the control file, see the document titled
- “Product Installation Control”.</para>
+ “Product Installation Control”.
+-->
+</para>
</section>
</section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.2/src/control/firstboot.xml new/yast2-firstboot-2.13.3/src/control/firstboot.xml
--- old/yast2-firstboot-2.13.2/src/control/firstboot.xml 2005-10-31 11:06:36.000000000 +0100
+++ new/yast2-firstboot-2.13.3/src/control/firstboot.xml 2006-08-31 09:25:28.000000000 +0200
@@ -4,7 +4,7 @@
xmlns:config="http://www.suse.com/1.0/configns">
<!--
- $Id: firstboot.xml 26032 2005-10-31 10:06:35Z jsrain $
+ $Id: firstboot.xml 32643 2006-08-31 07:26:57Z lslezak $
Work around for the text domain
textdomain="firstboot"
-->
@@ -47,6 +47,11 @@
<mode>installation</mode>
<modules config:type="list">
<module>
+ <label>Language</label>
+ <enabled config:type="boolean">false</enabled>
+ <name>firstboot_language</name>
+ </module>
+ <module>
<label>Welcome</label>
<name>inst_welcome</name>
</module>
@@ -54,53 +59,47 @@
<label>License Agreement</label>
<name>inst_license</name>
</module>
- <!--
<module>
<label>Network</label>
<name>inst_proposal</name>
- <proposal>firstboot_network</proposal>
- </module>
- <module>
- <label>Language</label>
<enabled config:type="boolean">false</enabled>
- <name>firstboot_language</name>
+ <proposal>firstboot_network</proposal>
</module>
<module>
<label>Time and Date</label>
- <enabled config:type="boolean">false</enabled>
+ <enabled config:type="boolean">true</enabled>
<name>firstboot_timezone</name>
</module>
<module>
<label>Desktop</label>
- <enabled config:type="boolean">true</enabled>
+ <enabled config:type="boolean">false</enabled>
<name>firstboot_desktop</name>
</module>
<module>
<label>Network</label>
<name>inst_proposal</name>
+ <enabled config:type="boolean">false</enabled>
<proposal>firstboot_network</proposal>
</module>
- -->
<module>
<label>Root Password</label>
- <enabled config:type="boolean">false</enabled>
+ <enabled config:type="boolean">true</enabled>
<name>inst_root</name>
</module>
- <!--
<module>
<label>Users</label>
- <enabled config:type="boolean">false</enabled>
+ <enabled config:type="boolean">true</enabled>
<name>inst_auth</name>
</module>
<module>
<label>Users</label>
- <enabled config:type="boolean">false</enabled>
+ <enabled config:type="boolean">true</enabled>
<name>inst_user</name>
</module>
- -->
<module>
<label>Hardware</label>
<name>inst_proposal</name>
+ <enabled config:type="boolean">false</enabled>
<proposal>firstboot_hardware</proposal>
</module>
<module>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-fonts
checked in at Fri Sep 1 01:20:06 CEST 2006.
--------
--- xorg-x11-fonts/xorg-x11-fonts.changes 2006-08-30 18:37:38.000000000 +0200
+++ xorg-x11-fonts/xorg-x11-fonts.changes 2006-08-31 12:53:48.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 12:44:36 CEST 2006 - sndirsch(a)suse.de
+
+- added fonts-config to Prereq of main and -core subpackage
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-fonts.spec ++++++
--- /var/tmp/diff_new_pack.NGy64S/_old 2006-09-01 01:19:43.000000000 +0200
+++ /var/tmp/diff_new_pack.NGy64S/_new 2006-09-01 01:19:44.000000000 +0200
@@ -14,11 +14,12 @@
BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.1
-Release: 8
+Release: 9
License: X11/MIT
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Fonts
+PreReq: fonts-config
Requires: %{name}-core
Provides: xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-scalable xorg-x11-fonts-syriac
Obsoletes: xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-scalable xorg-x11-fonts-syriac
@@ -70,6 +71,7 @@
%package core
Summary: Core Fonts for X.Org
Group: System/X11/Fonts
+PreReq: fonts-config
Provides: xorg-x11:/usr/X11R6/%{_lib}/X11/fonts/misc/cursor.pcf.gz
Autoreqprov: on
@@ -160,6 +162,8 @@
/usr/share/fonts/misc/fonts.alias
%changelog -n xorg-x11-fonts
+* Thu Aug 31 2006 - sndirsch(a)suse.de
+- added fonts-config to Prereq of main and -core subpackage
* Wed Aug 30 2006 - sndirsch(a)suse.de
- moved encodings to -core subpackage
* Tue Aug 29 2006 - sndirsch(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xemacs-packages
checked in at Fri Sep 1 01:19:35 CEST 2006.
--------
--- xemacs-packages/xemacs-packages.changes 2006-07-03 20:14:37.000000000 +0200
+++ xemacs-packages/xemacs-packages.changes 2006-08-31 11:50:02.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Aug 31 11:42:47 CEST 2006 - mfabian(a)suse.de
+
+- add "chmod 755 $RPM_SOURCE_DIR/texi2utf8" to make
+ it build in the openSUSE build service.
+ Permissions for any file in $RPM_SOURCE_DIR are nowhere guaranteed
+ to be preserved.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xemacs-packages.spec ++++++
--- /var/tmp/diff_new_pack.cZQN9q/_old 2006-09-01 01:19:15.000000000 +0200
+++ /var/tmp/diff_new_pack.cZQN9q/_new 2006-09-01 01:19:15.000000000 +0200
@@ -20,7 +20,7 @@
Obsoletes: mule-ucs-xemacs Mule-UCS-xemacs
Autoreqprov: on
Version: 20060510
-Release: 2
+Release: 4
# Howto get the cvs tree of the XEmacs packages:
# ==============================================
# cvs -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs login
@@ -151,6 +151,7 @@
%patch32 -p0
find lisp/ etc/ packages/ -name '*.elc' | xargs -r rm -f
chmod -R u+w *
+chmod 755 $RPM_SOURCE_DIR/texi2utf8
$RPM_SOURCE_DIR/texi2utf8
%build
@@ -941,6 +942,11 @@
%defattr(-,root,root)
%changelog -n xemacs-packages
+* Thu Aug 31 2006 - mfabian(a)suse.de
+- add "chmod 755 $RPM_SOURCE_DIR/texi2utf8" to make
+ it build in the openSUSE build service.
+ Permissions for any file in $RPM_SOURCE_DIR are nowhere guaranteed
+ to be preserved.
* Mon Jul 03 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Fri Jun 30 2006 - mfabian(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package abiword
checked in at Fri Sep 1 01:19:09 CEST 2006.
--------
--- GNOME/abiword/abiword.changes 2006-08-09 22:38:56.000000000 +0200
+++ abiword/abiword.changes 2006-08-31 18:29:32.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 31 18:29:03 CEST 2006 - gekker(a)suse.de
+
+- Remove unnecessary gal2-devel from BuildRequires
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ abiword.spec ++++++
--- /var/tmp/diff_new_pack.a5e197/_old 2006-09-01 01:18:55.000000000 +0200
+++ /var/tmp/diff_new_pack.a5e197/_new 2006-09-01 01:18:55.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: abiword
-BuildRequires: aspell-devel eel-devel enchant-devel fribidi-devel gal2-devel gnutls-devel gucharmap-devel libgnomedb-devel librsvg-devel libtiff-devel libwnck-devel libwpd-devel mDNSResponder-devel nautilus-devel poppler-devel psiconv-devel python-devel readline-devel update-desktop-files wv-devel
+BuildRequires: aspell-devel eel-devel enchant-devel fribidi-devel gnutls-devel gucharmap-devel libgnomedb-devel libgnomeprintui-devel librsvg-devel libtiff-devel libwnck-devel libwpd-devel mDNSResponder-devel nautilus-devel poppler-devel psiconv-devel python-devel readline-devel update-desktop-files wv-devel
%ifarch %ix86 ppc x86_64
BuildRequires: valgrind
%endif
@@ -24,7 +24,7 @@
Obsoletes: abiword2
Summary: A Multiplatform Word Processor
Version: 2.4.2
-Release: 22
+Release: 24
URL: http://www.abisource.com/
Source: %{name}-%{version}.tar.bz2
Patch2: abiword-uninited-vars.patch
@@ -122,6 +122,8 @@
/usr/share/pixmaps/*.png
%changelog -n abiword
+* Thu Aug 31 2006 - gekker(a)suse.de
+- Remove unnecessary gal2-devel from BuildRequires
* Wed Aug 09 2006 - gekker(a)suse.de
- Fix missing sentinel warnings
* Fri Jul 07 2006 - aj(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0