December 2007 - openSUSE Commits - openSUSE Mailing Lists

commit ndiswrapper
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package ndiswrapper checked in at Mon Dec 31 22:45:23 CET 2007. -------- --- arch/i386/ndiswrapper/ndiswrapper.changes 2007-11-13 00:57:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/ndiswrapper/ndiswrapper.changes 2007-12-26 22:26:49.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Dec 26 22:24:04 CET 2007 - crrodriguez(a)suse.de + +-update to version 1.51 +- ndiswrapper-1.49 crashes kernel, 1.51 works ok [#350735] +- Added support for 2.6.24-rcX kernels +- Fixed issue with changing mac address (with 'ifconfig hw ether ') +- Fixed kernel crash observed with mrv8335 in ad-hoc mode +- Fixed an smp issue that may cause ndiswrapper to stop transmitting packets after a while (noticed with Marvell Pre-N USB driver) + +------------------------------------------------------------------- Old: ---- ndiswrapper-1.49.tar.bz2 ndiswrapper-2.6.24.diff New: ---- ndiswrapper-1.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndiswrapper.spec ++++++ --- /var/tmp/diff_new_pack.q31772/_old 2007-12-31 22:45:00.000000000 +0100 +++ /var/tmp/diff_new_pack.q31772/_new 2007-12-31 22:45:00.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ndiswrapper (Version 1.49) +# spec file for package ndiswrapper (Version 1.51) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Group: System/Kernel AutoReqProv: on Summary: Use Microsoft NDIS Network Drivers for WLAN Cards -Version: 1.49 +Version: 1.51 Release: 1 Requires: pciutils Requires: ndiswrapper-kmp @@ -24,7 +24,6 @@ Source2: README.SUSE Source3: preamble Patch0: ndiswrapper.diff -Patch1: ndiswrapper-2.6.24.diff Url: http://ndiswrapper.sourceforge.net License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,7 +63,6 @@ %prep %setup %patch0 -p1 -%patch1 cp %SOURCE2 . mkdir obj @@ -85,7 +83,6 @@ done %install -rm -rf %buildroot install -d -m 755 %buildroot/sbin %buildroot/usr/sbin \ %buildroot/etc/ndiswrapper # Userspace stuff @@ -109,7 +106,15 @@ %doc INSTALL %doc AUTHORS %doc ChangeLog + %changelog +* Wed Dec 26 2007 - crrodriguez(a)suse.de +-update to version 1.51 +- ndiswrapper-1.49 crashes kernel, 1.51 works ok [#350735] +- Added support for 2.6.24-rcX kernels +- Fixed issue with changing mac address (with 'ifconfig hw ether ') +- Fixed kernel crash observed with mrv8335 in ad-hoc mode +- Fixed an smp issue that may cause ndiswrapper to stop transmitting packets after a while (noticed with Marvell Pre-N USB driver) * Tue Nov 13 2007 - ro(a)suse.de - hack to compile with 2.6.24rc2 (using mandriva patchkit) * Tue Nov 13 2007 - ro(a)suse.de ++++++ ndiswrapper-1.49.tar.bz2 -> ndiswrapper-1.51.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/ChangeLog new/ndiswrapper-1.51/ChangeLog --- old/ndiswrapper-1.49/ChangeLog 2007-10-28 07:18:43.000000000 +0100 +++ new/ndiswrapper-1.51/ChangeLog 2007-12-18 02:01:34.000000000 +0100 @@ -1,3 +1,17 @@ +Version 1.51 2007-12-17 +======================= +* Fixed an smp issue that may cause ndiswrapper to stop transmitting packets + after a while (noticed with Marvell Pre-N USB driver) + +Version 1.50 2007-11-27 +======================= +* Added support for 2.6.24-rcX kernels +* Fixed issue with changing mac address (with 'ifconfig <iface> hw ether + <mac>') - its broken since 1.45-rc2. Now one can also edit appropriate .conf + file to set the NetworkAddress setting to whatever mac address should be + used by the driver (e.g., NetworkAddress|0123456789ab) +* Fixed kernel crash observed with mrv8335 in ad-hoc mode + Version 1.49 2007-10-27 ======================= * If a driver returns invalid MAC address (00:00:00:00:00) when diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/iw_ndis.c new/ndiswrapper-1.51/driver/iw_ndis.c --- old/ndiswrapper-1.49/driver/iw_ndis.c 2007-10-28 07:18:43.000000000 +0100 +++ new/ndiswrapper-1.51/driver/iw_ndis.c 2007-12-18 02:01:34.000000000 +0100 @@ -1974,390 +1974,7 @@ return 0; } -#if WIRELESS_EXT <= 17 -/* WPA support through 'ndiswrapper' driver interface */ - -static int wpa_init(struct net_device *dev, struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - - ENTER2(""); - if (test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr) || - test_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr) || - test_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr)) - EXIT2(return 0); - else { - WARNING("driver is not WEP/WPA capable"); - EXIT2(return -1); - } -} - -static int wpa_deinit(struct net_device *dev, struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - ENTER2(""); - EXIT2(return 0); -} - -static int wpa_set_wpa(struct net_device *dev, struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - - ENTER2("flags = %d, wnd->capa.encr = %ld", - wrqu->data.flags, wnd->capa.encr); - if (wrqu->data.flags) { - if (test_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr) || - test_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr)) - EXIT2(return 0); - else { - WARNING("driver is not WPA capable"); - EXIT2(return -1); - } - } else - EXIT2(return 0); -} - -static int wpa_set_key(struct net_device *dev, struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - struct ndis_add_key ndis_key; - struct wpa_key wpa_key; - int i, size; - NDIS_STATUS res; - mac_address addr; - u8 seq[IW_ENCODING_TOKEN_MAX]; - u8 key[IW_ENCODING_TOKEN_MAX]; - - ENTER2(""); - if (wrqu->data.length) - size = wrqu->data.length; - else - size = sizeof(wpa_key); - if (copy_from_user(&wpa_key, wrqu->data.pointer, size)) - EXIT2(return -EFAULT); - if (wpa_key.addr && copy_from_user(&addr, wpa_key.addr, ETH_ALEN)) - EXIT2(return -EFAULT); - - if (wpa_key.seq && copy_from_user(&seq, wpa_key.seq, wpa_key.seq_len)) - EXIT2(return -EFAULT); - - if (wpa_key.key && copy_from_user(&key, wpa_key.key, wpa_key.key_len)) - EXIT2(return -EFAULT); - - TRACE2("alg = %d, key_index = %d", wpa_key.alg, wpa_key.key_index); - - if (wpa_key.alg == WPA_ALG_WEP) { - if (!test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr)) - EXIT2(return -1); - if (wpa_key.set_tx) - wnd->encr_info.tx_key_index = wpa_key.key_index; - if (add_wep_key(wnd, key, wpa_key.key_len, wpa_key.key_index)) - EXIT2(return -1); - else - EXIT2(return 0); - } - if (wpa_key.key_len > sizeof(ndis_key.key)) { - TRACE2("incorrect key length (%u)", (u32)wpa_key.key_len); - EXIT2(return -1); - } - if (wpa_key.seq_len > IW_ENCODING_TOKEN_MAX) { - TRACE2("incorrect seq? length = (%u)", (u32)wpa_key.seq_len); - EXIT2(return -1); - } - TRACE2("setting key %d, %u", wpa_key.key_index, (u32)wpa_key.key_len); - memset(&ndis_key, 0, sizeof(ndis_key)); - - ndis_key.struct_size = - sizeof(ndis_key) - sizeof(ndis_key.key) + wpa_key.key_len; - ndis_key.length = wpa_key.key_len; - ndis_key.index = wpa_key.key_index; - if (wpa_key.seq && wpa_key.seq_len > 0) { - for (i = 0, ndis_key.rsc = 0 ; i < wpa_key.seq_len ; i++) - ndis_key.rsc |= (seq[i] << (i * 8)); - - ndis_key.index |= 1 << 29; - } - TRACE2("infra_mode = %d, key.addr = %p, addr = " MACSTRSEP, - wnd->infrastructure_mode, wpa_key.addr, MAC2STR(addr)); - if (wpa_key.addr == NULL || - memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) == 0) { - /* group key */ - if (wnd->infrastructure_mode == Ndis802_11IBSS) - memset(ndis_key.bssid, 0xff, ETH_ALEN); - else - get_ap_address(wnd, ndis_key.bssid); - } else { - /* pairwise key */ - ndis_key.index |= (1 << 30); - memcpy(&ndis_key.bssid, addr, ETH_ALEN); - } - TRACE2("bssid " MACSTRSEP, MAC2STR(ndis_key.bssid)); - - if (wpa_key.set_tx) - ndis_key.index |= (1 << 31); - if (wpa_key.alg == WPA_ALG_TKIP && wpa_key.key_len == 32) { - /* wpa_supplicant gives us the Michael MIC RX/TX keys in - * different order than NDIS spec, so swap the order here. */ - memcpy(ndis_key.key, key, 16); - memcpy(ndis_key.key + 16, key + 24, 8); - memcpy(ndis_key.key + 24, key + 16, 8); - } else - memcpy(ndis_key.key, key, wpa_key.key_len); - if (wpa_key.alg == WPA_ALG_NONE || wpa_key.key_len == 0) { - /* TI driver crashes kernel if OID_802_11_REMOVE_KEY is - * called; other drivers seem to not require it, so - * for now, don't remove the key from drvier */ - wnd->encr_info.keys[wpa_key.key_index].length = 0; - memset(&wnd->encr_info.keys[wpa_key.key_index].key, 0, - wpa_key.key_len); - TRACE2("key %d removed", wpa_key.key_index); - } else { - res = mp_set(wnd, OID_802_11_ADD_KEY, - &ndis_key, ndis_key.struct_size); - if (res) { - TRACE2("adding key failed (%08X), %u", - res, ndis_key.struct_size); - EXIT2(return -1); - } - wnd->encr_info.keys[wpa_key.key_index].length = - wpa_key.key_len; - memcpy(&wnd->encr_info.keys[wpa_key.key_index].key, - &ndis_key.key, wpa_key.key_len); - if (wpa_key.set_tx) - wnd->encr_info.tx_key_index = wpa_key.key_index; - TRACE2("key %d added", wpa_key.key_index); - } - EXIT2(return 0); -} - -static int wpa_disassociate(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - disassociate(wnd, 1); - EXIT2(return 0); -} - -static int wpa_associate(struct net_device *dev, struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - struct wpa_assoc_info wpa_assoc_info; - char ssid[NDIS_ESSID_MAX_SIZE]; - int size, infra_mode, auth_mode, cipher_pairwise, cipher_groupwise; - - ENTER2(""); - memset(&wpa_assoc_info, 0, sizeof(wpa_assoc_info)); - wpa_assoc_info.mode = IEEE80211_MODE_INFRA; - - if (wrqu->data.length == 0) - size = (void *)&wpa_assoc_info.auth_alg - - (void *)&wpa_assoc_info.bssid; - else - size = min((size_t)wrqu->data.length, sizeof(wpa_assoc_info)); - - if (copy_from_user(&wpa_assoc_info, wrqu->data.pointer, size)) - EXIT2(return -EFAULT); - if (copy_from_user(&ssid, wpa_assoc_info.ssid, - wpa_assoc_info.ssid_len)) - EXIT2(return -EFAULT); - - if (wpa_assoc_info.mode == IEEE80211_MODE_IBSS) - infra_mode = Ndis802_11IBSS; - else - infra_mode = Ndis802_11Infrastructure; - - TRACE2("key_mgmt_suite = %d, pairwise_suite = %d, group_suite= %d", - wpa_assoc_info.key_mgmt_suite, wpa_assoc_info.pairwise_suite, - wpa_assoc_info.group_suite); - - if (wpa_assoc_info.wpa_ie == NULL || wpa_assoc_info.wpa_ie_len == 0) { - if (wpa_assoc_info.auth_alg & AUTH_ALG_SHARED_KEY) { - if (wpa_assoc_info.auth_alg & AUTH_ALG_OPEN_SYSTEM) - auth_mode = Ndis802_11AuthModeAutoSwitch; - else - auth_mode = Ndis802_11AuthModeShared; - } else - auth_mode = Ndis802_11AuthModeOpen; - priv_mode = Ndis802_11PrivFilterAcceptAll; - } else if (wpa_assoc_info.wpa_ie[0] == RSN_INFO_ELEM) { - if (wpa_assoc_info.key_mgmt_suite == KEY_MGMT_PSK) { - auth_mode = Ndis802_11AuthModeWPA2PSK; - else - auth_mode = Ndis802_11AuthModeWPA2; - } - } else { - if (wpa_assoc_info.key_mgmt_suite == KEY_MGMT_WPA_NONE || - wpa_assoc_info.key_mgmt_suite == KEY_MGMT_802_1X_NO_WPA) - auth_mode = Ndis802_11AuthModeWPANone; - else { - if (wpa_assoc_info.key_mgmt_suite == KEY_MGMT_PSK) - auth_mode = Ndis802_11AuthModeWPAPSK; - else - auth_mode = Ndis802_11AuthModeWPA; - } - } - - cipher_groupwise = IW_AUTH_CIPHER_NONE; - switch (wpa_assoc_info.pairwise_suite) { - case CIPHER_CCMP: - cipher_pairwise = IW_AUTH_CIPHER_CCMP; - break; - case CIPHER_TKIP: - cipher_pairwise = IW_AUTH_CIPHER_TKIP; - break; - case CIPHER_WEP40: - case CIPHER_WEP104: - cipher_pairwise = IW_AUTH_CIPHER_WEP104; - break; - case CIPHER_NONE: - switch (wpa_assoc_info.group_suite) { - case CIPHER_CCMP: - cipher_groupwise = IW_AUTH_CIPHER_CCMP; - break; - case CIPHER_TKIP: - cipher_groupwise = IW_AUTH_CIPHER_CCMP; - break; - default: - cipher_groupwise = IW_AUTH_CIPHER_NONE; - break; - } - default: - cipher_pairwise = IW_AUTH_CIPHER_NONE; - break; - }; - - set_infra_mode(wnd, infra_mode); - set_ndis_auth_mode(wnd, auth_mode); - set_priv_filter(wnd); - set_encr_mode(wnd, cipher_pairwise, cipher_groupwise); - -#if 0 - /* set channel */ - for (i = 0; i < (sizeof(freq_chan)/sizeof(freq_chan[0])); i++) { - if (wpa_assoc_info.freq == freq_chan[i]) { - union iwreq_data freq_req; - - memset(&freq_req, 0, sizeof(freq_req)); - freq_req.freq.m = i; - if (iw_set_freq(dev, NULL, &freq_req, NULL)) - EXIT2(return -1); - } - } -#endif - /* set ssid */ - if (set_essid(wnd, ssid, wpa_assoc_info.ssid_len)) - EXIT2(return -1); - - EXIT2(return 0); -} - -static int wpa_set_countermeasures(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - ENTER2(""); - return 0; -} - -static int wpa_deauthenticate(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - EXIT2(return deauthenticate(wnd)); -} - -static int wpa_set_priv_filter(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - int mode; - - ENTER2("filter: %d", wrqu->param.value); - if (wrqu->param.value) - mode = IW_AUTH_WPA_VERSION_WPA; - else - mode = IW_AUTH_WPA_VERSION_DISABLED; - if (set_priv_filter(wnd, mode)) - EXIT2(return -1); - EXIT2(return 0); -} - -static int wpa_set_auth_alg(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - int mode; - - ENTER2("%d", wrqu->param.value); - if (wrqu->param.value & AUTH_ALG_SHARED_KEY) - mode = Ndis802_11AuthModeShared; - else if (wrqu->param.value & AUTH_ALG_OPEN_SYSTEM) - mode = Ndis802_11AuthModeOpen; - else - EXIT2(return -1); - TRACE2("%d", mode); - if (set_ndis_auth_mode(wnd, mode)) - EXIT2(return -1); - EXIT2(return 0); -} - -static int wpa_get_capa(struct net_device *dev, struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - struct wrap_ndis_device *wnd = netdev_priv(dev); - struct wpa_driver_capa *drv_capa; - - ENTER2("%p", wnd); - drv_capa = (struct wpa_driver_capa *)wrqu->data.pointer; - if (!drv_capa) - EXIT2(return -1); - drv_capa->key_mgmt = 0; - if (test_bit(Ndis802_11AuthModeWPA, &wnd->capa.auth)) - drv_capa->key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_WPA; - if (test_bit(Ndis802_11AuthModeWPAPSK, &wnd->capa.auth)) - drv_capa->key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK; - if (test_bit(Ndis802_11AuthModeWPA2, &wnd->capa.auth)) - drv_capa->key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_WPA2; - if (test_bit(Ndis802_11AuthModeWPA2PSK, &wnd->capa.auth)) - drv_capa->key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK; - if (test_bit(Ndis802_11AuthModeWPANone, &wnd->capa.auth)) - drv_capa->key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE; - - drv_capa->enc = 0; - if (test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr)) - drv_capa->enc |= WPA_DRIVER_CAPA_ENC_WEP40 | - WPA_DRIVER_CAPA_ENC_WEP104; - if (test_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr)) - drv_capa->enc |= WPA_DRIVER_CAPA_ENC_TKIP; - if (test_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr)) - drv_capa->enc |= WPA_DRIVER_CAPA_ENC_CCMP; - - /* TODO: how to check if LEAP is supported? */ - drv_capa->auth = WPA_DRIVER_AUTH_OPEN | WPA_DRIVER_AUTH_SHARED; - - drv_capa->flags = WPA_DRIVER_FLAGS_DRIVER_IE | - WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC; - EXIT2(return 0); -} - -#endif // WIRELESS_EXT <= 17 - static const struct iw_priv_args priv_args[] = { -#if WIRELESS_EXT <= 17 - {WPA_DROP_UNENCRYPTED, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, - "set_priv_filter"}, - {WPA_SET_AUTH_ALG, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, - "auth_alg"}, -#endif - {PRIV_RESET, 0, 0, "ndis_reset"}, {PRIV_POWER_PROFILE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "power_profile"}, @@ -2373,19 +1990,6 @@ #define WEPRIV(id) [id - SIOCIWFIRSTPRIV] static const iw_handler priv_handler[] = { -#if WIRELESS_EXT <= 17 - WEPRIV(WPA_SET_WPA) = wpa_set_wpa, - WEPRIV(WPA_SET_KEY) = wpa_set_key, - WEPRIV(WPA_ASSOCIATE) = wpa_associate, - WEPRIV(WPA_DISASSOCIATE) = wpa_disassociate, - WEPRIV(WPA_DROP_UNENCRYPTED) = wpa_set_priv_filter, - WEPRIV(WPA_SET_COUNTERMEASURES) = wpa_set_countermeasures, - WEPRIV(WPA_DEAUTHENTICATE) = wpa_deauthenticate, - WEPRIV(WPA_SET_AUTH_ALG) = wpa_set_auth_alg, - WEPRIV(WPA_INIT) = wpa_init, - WEPRIV(WPA_DEINIT) = wpa_deinit, - WEPRIV(WPA_GET_CAPA) = wpa_get_capa, -#endif WEPRIV(PRIV_RESET) = priv_reset, WEPRIV(PRIV_POWER_PROFILE) = priv_power_profile, WEPRIV(PRIV_DEAUTHENTICATE) = priv_deauthenticate, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/Makefile new/ndiswrapper-1.51/driver/Makefile --- old/ndiswrapper-1.49/driver/Makefile 2007-10-28 07:18:43.000000000 +0100 +++ new/ndiswrapper-1.51/driver/Makefile 2007-12-18 02:01:34.000000000 +0100 @@ -65,58 +65,58 @@ endif include $(KBUILD)/.config -CFLAGS += $(shell [ -f $(KSRC)/include/linux/modversions.h ] && \ +MOD_CFLAGS += $(shell [ -f $(KSRC)/include/linux/modversions.h ] && \ echo -DEXPORT_SYMTAB -DMODVERSIONS \ -include $(KSRC)/include/linux/modversions.h) ifndef DISABLE_USB -CFLAGS += $(shell if grep -q 'struct module \*owner;' \ +MOD_CFLAGS += $(shell if grep -q 'struct module \*owner;' \ $(KSRC)/include/linux/usb.h ; then \ echo -DUSB_DRIVER_OWNER; \ fi) endif # returns of structs and unions in registers when possible, like Windows -CFLAGS += -freg-struct-return +MOD_CFLAGS += -freg-struct-return # to produce debug trace, add option "DEBUG=<n>" where <n> is 1 to 6 ifdef DEBUG -CFLAGS += -DDEBUG=$(DEBUG) -g +MOD_CFLAGS += -DDEBUG=$(DEBUG) -g endif # to debug timers, add option "TIMER_DEBUG=1 DEBUG=<n>" ifdef TIMER_DEBUG -CFLAGS += -DTIMER_DEBUG +MOD_CFLAGS += -DTIMER_DEBUG endif # to debug event layer, add option "EVENT_DEBUG=1 DEBUG=<n>" ifdef EVENT_DEBUG -CFLAGS += -DEVENT_DEBUG +MOD_CFLAGS += -DEVENT_DEBUG endif # to debug USB layer, add option "USB_DEBUG=1 DEBUG=<n>" ifdef USB_DEBUG -CFLAGS += -DUSB_DEBUG +MOD_CFLAGS += -DUSB_DEBUG endif # to debug I/O layer, add option "IO_DEBUG=1 DEBUG=<n>" ifdef IO_DEBUG -CFLAGS += -DIO_DEBUG +MOD_CFLAGS += -DIO_DEBUG endif # to debug worker threads ifdef WORK_DEBUG -CFLAGS += -DWORK_DEBUG +MOD_CFLAGS += -DWORK_DEBUG endif # to debug memory allocation issues ifdef ALLOC_DEBUG -CFLAGS += -DALLOC_DEBUG=$(ALLOC_DEBUG) +MOD_CFLAGS += -DALLOC_DEBUG=$(ALLOC_DEBUG) endif # emulate (pseudo) preemption ifdef WRAP_PREEMPT -CFLAGS += -DWRAP_PREEMPT +MOD_CFLAGS += -DWRAP_PREEMPT endif .PHONY: prereq_check gen_exports clean dist_clean install stack_check @@ -133,7 +133,7 @@ ifdef DISABLE_USB usb_exports.h: -CFLAGS += -DDISABLE_USB +MOD_CFLAGS += -DDISABLE_USB else usb_exports.h: usb.c @@ -145,23 +145,18 @@ endif endif -ifeq ($(KPSUB),24) -CFLAGS += -DUSE_OWN_WQ -OBJS += workqueue.o -endif - -CFLAGS += $(shell if grep -s -A1 'ndiswrapper' $(KSRC)/kernel/module.c | \ +MOD_CFLAGS += $(shell if grep -s -A1 'ndiswrapper' $(KSRC)/kernel/module.c | \ grep -q 'add_taint_module' ; then \ echo -DUSE_OWN_WQ; \ fi) ifdef WRAP_WQ -CFLAGS += -DWRAP_WQ +MOD_CFLAGS += -DWRAP_WQ OBJS += workqueue.o endif ifdef NTOS_WQ -CFLAGS += -DNTOS_WQ +MOD_CFLAGS += -DNTOS_WQ endif ntoskernel.h: lin2win.h @@ -281,6 +276,10 @@ echo "static inline void netif_tx_unlock_bh(struct net_device *dev)"; \ echo "{ spin_unlock_bh(&dev->xmit_lock); }"; \ fi >> $@ + @if ! grep -qw netif_poll_enable $(KSRC)/include/linux/netdevice.h; then \ + echo "static inline void netif_poll_enable(struct net_device *dev) {}"; \ + echo "static inline void netif_poll_disable(struct net_device *dev) {}"; \ + fi >> $@ @if ! grep -qw pci_set_consistent_dma_mask \ $(KSRC)/include/linux/pci.h; then \ echo "static inline int pci_set_consistent_dma_mask" ; \ @@ -295,6 +294,11 @@ @if [ -f $(KSRC)/include/linux/percpu.h ]; then \ echo "#include <linux/percpu.h>"; \ fi >> $@ + @if grep -qw proc_net $(KSRC)/include/linux/proc_fs.h; then \ + echo "#define proc_net_root proc_net"; \ + else \ + echo "#define proc_net_root init_net.proc_net"; \ + fi >> $@ prereq_check: @if [ ! -f $(KBUILD)/include/linux/version.h ]; then \ @@ -318,19 +322,14 @@ distclean: clean rm -f *_exports.h .\#* win2lin_stubs.h built-in.o -ifeq ($(KPSUB),24) +wflags := $(shell if grep -qw "EXTRA_CFLAGS" $(KSRC)/scripts/Makefile.build; \ + then echo "EXTRA_CFLAGS"; else echo "CFLAGS"; fi) -MODULE := ndiswrapper.o -CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -I$(KSRC)/include \ - -Wall -Wstrict-prototypes -fomit-frame-pointer \ - -fno-strict-aliasing -pipe -O2 - -ifneq ($(CONFIG_X86_64),y) -CFLAGS += -mpreferred-stack-boundary=2 -endif -default: $(OBJS) - $(LD) -r -o $(MODULE) $(OBJS) +ifeq ($(wflags), CFLAGS) +CFLAGS += $(MOD_CFLAGS) else +EXTRA_CFLAGS += $(MOD_CFLAGS) +endif MODULE := ndiswrapper.ko obj-m := ndiswrapper.o @@ -340,7 +339,6 @@ default: $(MAKE) -C $(KBUILD) SUBDIRS=$(SRC_DIR) -endif stack_check: @if [ "x$(CONFIG_X86_64)" = "x" -a $(KPSUB) -eq 26 ] && \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/ndis.c new/ndiswrapper-1.51/driver/ndis.c --- old/ndiswrapper-1.49/driver/ndis.c 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/ndis.c 2007-12-18 02:01:34.000000000 +0100 @@ -525,9 +525,8 @@ } } up(&loader_mutex); - setting = kmalloc(sizeof(*setting), GFP_KERNEL); + setting = kzalloc(sizeof(*setting), GFP_KERNEL); if (setting) { - memset(setting, 0, sizeof(*setting)); if (ansi.length == ansi.max_length) ansi.length--; memcpy(setting->name, keyname, ansi.length); @@ -548,6 +547,56 @@ EXIT2(return); } +wstdcall void WIN_FUNC(NdisReadNetworkAddress,4) + (NDIS_STATUS *status, void **addr, UINT *len, + struct ndis_mp_block *nmb) +{ + struct wrap_ndis_device *wnd = nmb->wnd; + struct ndis_configuration_parameter *param; + struct unicode_string key; + struct ansi_string ansi; + typeof(wnd->mac) mac; + int i, ret; + + ENTER2("%p", nmb); + RtlInitAnsiString(&ansi, "NetworkAddress"); + *status = NDIS_STATUS_FAILURE; + if (RtlAnsiStringToUnicodeString(&key, &ansi, TRUE) != STATUS_SUCCESS) + EXIT1(return); + + NdisReadConfiguration(&ret, &param, nmb, &key, NdisParameterString); + RtlFreeUnicodeString(&key); + if (ret != NDIS_STATUS_SUCCESS) + EXIT1(return); + ret = RtlUnicodeStringToAnsiString(&ansi, &param->data.string, TRUE); + if (ret != STATUS_SUCCESS) + EXIT1(return); + + i = 0; + if (ansi.length >= 2 * sizeof(mac)) { + for (i = 0; i < sizeof(mac); i++) { + char c[3]; + int x; + c[0] = ansi.buf[i*2]; + c[1] = ansi.buf[i*2+1]; + c[2] = 0; + ret = sscanf(c, "%x", &x); + if (ret != 1) + break; + mac[i] = x; + } + } + TRACE2("%s, %d, " MACSTR, ansi.buf, i, MAC2STR(mac)); + RtlFreeAnsiString(&ansi); + if (i == sizeof(mac)) { + memcpy(wnd->mac, mac, sizeof(wnd->mac)); + *len = sizeof(mac); + *addr = wnd->mac; + *status = NDIS_STATUS_SUCCESS; + } + EXIT1(return); +} + wstdcall void WIN_FUNC(NdisInitializeString,2) (struct unicode_string *dest, UCHAR *src) { @@ -559,6 +608,7 @@ dest->buf = NULL; } else { RtlInitAnsiString(&ansi, src); + /* the string is freed with NdisFreeMemory */ RtlAnsiStringToUnicodeString(dest, &ansi, TRUE); } EXIT2(return); @@ -1135,7 +1185,7 @@ { ndis_buffer *descr; - ENTER4("pool: %p, allocated: %d", pool, pool->num_allocated_descr); + ENTER4("pool: %p (%d)", pool, pool->num_allocated_descr); /* NDIS drivers should call this at DISPATCH_LEVEL, but * alloc_tx_packet calls at SOFT_IRQL */ assert_irql(_irql_ <= SOFT_LEVEL); @@ -1197,16 +1247,15 @@ EXIT4(return); } pool = buffer->pool; - spin_lock_bh(&pool->lock); if (pool->num_allocated_descr > MAX_ALLOCATED_NDIS_BUFFERS) { /* NB NB NB: set mdl's 'pool' field to NULL before * calling free_mdl; otherwise free_mdl calls - * NdisFreeBuffer causing deadlock (for spinlock) */ - pool->num_allocated_descr--; + * NdisFreeBuffer back */ + atomic_dec_var(pool->num_allocated_descr); buffer->pool = NULL; - spin_unlock_bh(&pool->lock); free_mdl(buffer); } else { + spin_lock_bh(&pool->lock); buffer->next = pool->free_descr; pool->free_descr = buffer; spin_unlock_bh(&pool->lock); @@ -1480,7 +1529,7 @@ } atomic_inc_var(pool->num_allocated_descr); } - TRACE4("%p, %p, %p", pool, packet, pool->free_descr); + TRACE4("%p, %p", pool, packet); atomic_inc_var(pool->num_used_descr); memset(packet, 0, packet_length); packet->private.oob_offset = @@ -1504,30 +1553,31 @@ { struct ndis_packet_pool *pool; - ENTER4("packet: %p, pool: %p", packet, packet->private.pool); + ENTER4("%p, %p", packet, packet->private.pool); pool = packet->private.pool; if (!pool) { - ERROR("pool for descriptor %p is invalid", packet); + ERROR("invalid pool %p", packet); EXIT4(return); } - spin_lock_bh(&pool->lock); - pool->num_used_descr--; + assert((int)pool->num_used_descr > 0); + atomic_dec_var(pool->num_used_descr); if (packet->reserved[1]) { TRACE3("%p, %p", packet, (void *)packet->reserved[1]); kfree((void *)packet->reserved[1]); packet->reserved[1] = 0; } if (pool->num_allocated_descr > MAX_ALLOCATED_NDIS_PACKETS) { - TRACE3("%p", packet); - pool->num_allocated_descr--; + TRACE3("%p", pool); + atomic_dec_var(pool->num_allocated_descr); kfree(packet); } else { TRACE4("%p, %p, %p", pool, packet, pool->free_descr); + spin_lock_bh(&pool->lock); packet->reserved[0] = (typeof(packet->reserved[0]))pool->free_descr; pool->free_descr = packet; + spin_unlock_bh(&pool->lock); } - spin_unlock_bh(&pool->lock); EXIT4(return); } @@ -1786,47 +1836,6 @@ TIMEREXIT(return); } -wstdcall void WIN_FUNC(NdisReadNetworkAddress,4) - (NDIS_STATUS *status, void **addr, UINT *len, - struct ndis_mp_block *nmb) -{ - struct wrap_ndis_device *wnd = nmb->wnd; - struct ndis_configuration_parameter *param; - struct unicode_string key; - struct ansi_string ansi; - int int_mac[ETH_ALEN]; - int ret; - - ENTER2("%p", nmb); - RtlInitAnsiString(&ansi, "NetworkAddress"); - *len = 0; - *status = NDIS_STATUS_FAILURE; - if (RtlAnsiStringToUnicodeString(&key, &ansi, TRUE) != STATUS_SUCCESS) - EXIT1(return); - - NdisReadConfiguration(status, &param, nmb, &key, NdisParameterString); - RtlFreeUnicodeString(&key); - if (*status != NDIS_STATUS_SUCCESS) - EXIT1(return); - ret = RtlUnicodeStringToAnsiString(&ansi, &param->data.string, TRUE); - if (ret != STATUS_SUCCESS) - EXIT1(return); - - ret = sscanf(ansi.buf, MACSTR, MACINTADR(int_mac)); - RtlFreeAnsiString(&ansi); - if (ret == ETH_ALEN) { - int i; - for (i = 0; i < ETH_ALEN; i++) - wnd->mac[i] = int_mac[i]; - printk(KERN_INFO "%s: %s ethernet device " MACSTRSEP "\n", - wnd->net_dev->name, DRIVER_NAME, MAC2STR(wnd->mac)); - *len = ETH_ALEN; - *addr = wnd->mac; - *status = NDIS_STATUS_SUCCESS; - } - EXIT1(return); -} - wstdcall void WIN_FUNC(NdisMRegisterAdapterShutdownHandler,3) (struct ndis_mp_block *nmb, void *ctx, void *func) { @@ -2506,12 +2515,13 @@ NDIS_STATUS status) { struct wrap_ndis_device *wnd = nmb->wnd; + typeof(wnd->ndis_req_task) task; ENTER2("nmb: %p, wnd: %p, %08X", nmb, wnd, status); wnd->ndis_req_status = status; wnd->ndis_req_done = 1; - if (wnd->ndis_req_task) - wake_up_process(wnd->ndis_req_task); + if ((task = xchg(&wnd->ndis_req_task, NULL))) + wake_up_process(task); else WARNING("invalid task"); EXIT2(return); @@ -2522,12 +2532,13 @@ NDIS_STATUS status) { struct wrap_ndis_device *wnd = nmb->wnd; + typeof(wnd->ndis_req_task) task; ENTER2("status = %08X", status); wnd->ndis_req_status = status; wnd->ndis_req_done = 1; - if (wnd->ndis_req_task) - wake_up_process(wnd->ndis_req_task); + if ((task = xchg(&wnd->ndis_req_task, NULL))) + wake_up_process(task); else WARNING("invalid task"); EXIT2(return); @@ -2538,12 +2549,13 @@ NDIS_STATUS status, BOOLEAN address_reset) { struct wrap_ndis_device *wnd = nmb->wnd; + typeof(wnd->ndis_req_task) task; ENTER2("status: %08X, %u", status, address_reset); wnd->ndis_req_status = status; wnd->ndis_req_done = address_reset + 1; - if (wnd->ndis_req_task) - wake_up_process(wnd->ndis_req_task); + if ((task = xchg(&wnd->ndis_req_task, NULL))) + wake_up_process(task); else WARNING("invalid task"); EXIT2(return); @@ -2832,12 +2844,13 @@ struct ndis_request *ndis_request) { struct wrap_ndis_device *wnd = nmb->wnd; + typeof(wnd->ndis_req_task) task; ENTER3("%08X", status); wnd->ndis_req_status = status; wnd->ndis_req_done = 1; - if (wnd->ndis_req_task) - wake_up_process(wnd->ndis_req_task); + if ((task = xchg(&wnd->ndis_req_task, NULL))) + wake_up_process(task); else WARNING("invalid task"); EXIT3(return); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/ndis.h new/ndiswrapper-1.51/driver/ndis.h --- old/ndiswrapper-1.49/driver/ndis.h 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/ndis.h 2007-12-18 02:01:34.000000000 +0100 @@ -612,7 +612,7 @@ enum wrapper_work { LINK_STATUS_OFF, LINK_STATUS_ON, SET_MULTICAST_LIST, COLLECT_IW_STATS, - HANGCHECK, NETIF_WAKEQ, SHUTDOWN, + HANGCHECK, NETIF_WAKEQ, }; struct encr_info { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/ndiswrapper.h new/ndiswrapper-1.51/driver/ndiswrapper.h --- old/ndiswrapper-1.49/driver/ndiswrapper.h 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/ndiswrapper.h 2007-12-18 02:01:34.000000000 +0100 @@ -16,7 +16,7 @@ #ifndef _NDISWRAPPER_H_ #define _NDISWRAPPER_H_ -#define DRIVER_VERSION "1.49" +#define DRIVER_VERSION "1.51" #define UTILS_VERSION "1.9" #define DRIVER_NAME "ndiswrapper" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/ntoskernel.c new/ndiswrapper-1.51/driver/ntoskernel.c --- old/ndiswrapper-1.49/driver/ntoskernel.c 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/ntoskernel.c 2007-12-18 02:01:34.000000000 +0100 @@ -1129,8 +1129,8 @@ DBG_BLOCK(2) { KIRQL irql = current_irql(); if (irql >= DISPATCH_LEVEL) { - TRACE2("wait in atomic context: %Lu, %lu, %d, %ld", - *timeout, wait_hz, in_atomic(), in_interrupt()); + TRACE2("wait in atomic context: %lu, %d, %ld", + wait_hz, in_atomic(), in_interrupt()); } } assert_irql(_irql_ < DISPATCH_LEVEL); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/ntoskernel.h new/ndiswrapper-1.51/driver/ntoskernel.h --- old/ndiswrapper-1.49/driver/ntoskernel.h 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/ntoskernel.h 2007-12-18 02:01:34.000000000 +0100 @@ -612,7 +612,9 @@ #define NTOS_WQ 1 #endif +#ifndef NTOS_WQ #define NTOS_WQ 1 +#endif #ifdef NTOS_WQ extern workqueue_struct_t *ntos_wq; @@ -714,6 +716,9 @@ typedef struct { int count; struct mutex lock; +#ifdef CONFIG_SMP + typeof(current->cpus_allowed) cpus_allowed; +#endif struct task_struct *task; } irql_info_t; @@ -743,6 +748,7 @@ /* TODO: is this enough to pin down to current cpu? */ #ifdef CONFIG_SMP assert(task_cpu(current) == smp_processor_id()); + info->cpus_allowed = current->cpus_allowed; current->cpus_allowed = cpumask_of_cpu(smp_processor_id()); #endif put_cpu_var(irql_info); @@ -765,10 +771,10 @@ assert(info->count > 0); if (--info->count == 0) { info->task = NULL; - mutex_unlock(&info->lock); #ifdef CONFIG_SMP - current->cpus_allowed = CPU_MASK_ALL; + current->cpus_allowed = info->cpus_allowed; #endif + mutex_unlock(&info->lock); } put_cpu_var(irql_info); } @@ -845,12 +851,12 @@ "1:\t" " xchgl %1, %0\n\t" " testl %1, %1\n\t" - " je 3f\n" + " jz 3f\n" "2:\t" " rep; nop\n\t" " cmpl %2, %0\n\t" - " jne 2b\n\t" - " jmp 1b\n" + " je 1b\n\t" + " jmp 2b\n" "3:\n\t" : "+m" (*lock) : "r" (NT_SPIN_LOCK_LOCKED), "i" (NT_SPIN_LOCK_UNLOCKED)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/proc.c new/ndiswrapper-1.51/driver/proc.c --- old/ndiswrapper-1.49/driver/proc.c 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/proc.c 2007-12-18 02:01:34.000000000 +0100 @@ -357,6 +357,33 @@ res = mp_set_int(wnd, OID_GEN_CURRENT_PACKET_FILTER, i); if (res) WARNING("setting packet_filter failed: %08X", res); + } else if (!strcmp(setting, "reinit")) { + if (ndis_reinit(wnd) != NDIS_STATUS_SUCCESS) + return -EFAULT; + } else { + struct ndis_configuration_parameter param; + struct unicode_string key; + struct ansi_string ansi; + + if (!p) + return -EINVAL; + p++; + RtlInitAnsiString(&ansi, p); + if (RtlAnsiStringToUnicodeString(&param.data.string, &ansi, + TRUE) != STATUS_SUCCESS) + EXIT1(return -EFAULT); + param.type = NdisParameterString; + RtlInitAnsiString(&ansi, setting); + if (RtlAnsiStringToUnicodeString(&key, &ansi, + TRUE) != STATUS_SUCCESS) { + RtlFreeUnicodeString(&param.data.string); + EXIT1(return -EINVAL); + } + NdisWriteConfiguration(&res, wnd->nmb, &key, &param); + RtlFreeUnicodeString(&key); + RtlFreeUnicodeString(&param.data.string); + if (res != NDIS_STATUS_SUCCESS) + return -EFAULT; } return count; } @@ -508,7 +535,7 @@ { struct proc_dir_entry *procfs_entry; - wrap_procfs_entry = proc_mkdir(DRIVER_NAME, proc_net); + wrap_procfs_entry = proc_mkdir(DRIVER_NAME, proc_net_root); if (wrap_procfs_entry == NULL) { ERROR("couldn't create procfs directory"); return -ENOMEM; @@ -535,5 +562,5 @@ if (wrap_procfs_entry == NULL) return; remove_proc_entry("debug", wrap_procfs_entry); - remove_proc_entry(DRIVER_NAME, proc_net); + remove_proc_entry(DRIVER_NAME, proc_net_root); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/driver/wrapndis.c new/ndiswrapper-1.51/driver/wrapndis.c --- old/ndiswrapper-1.49/driver/wrapndis.c 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/driver/wrapndis.c 2007-12-18 02:01:34.000000000 +0100 @@ -398,20 +398,22 @@ TRACE1("new mac: %s", mac_string); RtlInitAnsiString(&ansi, mac_string); - if (RtlAnsiStringToUnicodeString(&param.data.string, &ansi, TRUE)) { - RtlFreeUnicodeString(&key); + if (RtlAnsiStringToUnicodeString(&param.data.string, &ansi, + TRUE) != STATUS_SUCCESS) EXIT1(return -EINVAL); - } + param.type = NdisParameterString; RtlInitAnsiString(&ansi, "NetworkAddress"); - if (RtlAnsiStringToUnicodeString(&key, &ansi, TRUE)) + if (RtlAnsiStringToUnicodeString(&key, &ansi, TRUE) != STATUS_SUCCESS) { + RtlFreeUnicodeString(&param.data.string); EXIT1(return -EINVAL); + } NdisWriteConfiguration(&res, wnd->nmb, &key, &param); RtlFreeUnicodeString(&key); RtlFreeUnicodeString(&param.data.string); if (res != NDIS_STATUS_SUCCESS) - EXIT1(return -EINVAL); + EXIT1(return -EFAULT); if (ndis_reinit(wnd) == NDIS_STATUS_SUCCESS) { res = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, mac, sizeof(mac)); @@ -456,9 +458,9 @@ sg_element->address = PCI_DMA_MAP_SINGLE(wnd->wd->pci.pdev, skb->data, skb_headlen(skb), PCI_DMA_TODEVICE); - sg_element++; - for (i = 0; i < skb_shinfo(skb)->nr_frags; i++, sg_element++) { + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; + sg_element++; sg_element->length = frag->size; sg_element->address = pci_map_page(wnd->wd->pci.pdev, frag->page, @@ -971,10 +973,6 @@ union iwreq_data wrqu; NDIS_STATUS res; const int assoc_size = sizeof(*ndis_assoc_info) + IW_CUSTOM_MAX + 32; -#if WIRELESS_EXT <= 17 - unsigned char *wpa_assoc_info, *ies; - unsigned char *p; -#endif #endif ENTER2(""); @@ -1008,41 +1006,6 @@ ((char *)ndis_assoc_info) + ndis_assoc_info->offset_resp_ies); } -#else - /* we need 28 extra bytes for the format strings */ - if ((ndis_assoc_info->req_ie_length + - ndis_assoc_info->resp_ie_length + 28) > IW_CUSTOM_MAX) { - WARNING("information element is too long! (%u,%u)," - "association information dropped", - ndis_assoc_info->req_ie_length, - ndis_assoc_info->resp_ie_length); - kfree(ndis_assoc_info); - goto send_assoc_event; - } - - wpa_assoc_info = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL); - if (!wpa_assoc_info) { - ERROR("couldn't allocate memory"); - kfree(ndis_assoc_info); - goto send_assoc_event; - } - p = wpa_assoc_info; - p += sprintf(p, "ASSOCINFO(ReqIEs="); - memcpy(p, ((char *)ndis_assoc_info) + ndis_assoc_info->offset_req_ies, - ndis_assoc_info->req_ie_length); - p += ndis_assoc_info->req_ie_length; - - p += sprintf(p, " RespIEs="); - memcpy(p, ((char *)ndis_assoc_info) + ndis_assoc_info->offset_resp_ies, - ndis_assoc_info->resp_ie_length); - p += ndis_assoc_info->resp_ie_length; - - p += sprintf(p, ")"); - - wrqu.data.length = p - wpa_assoc_info; - wireless_send_event(wnd->net_dev, IWEVCUSTOM, &wrqu, wpa_assoc_info); - - kfree(wpa_assoc_info); #endif kfree(ndis_assoc_info); @@ -1132,9 +1095,6 @@ wnd = worker_param_data(param, struct wrap_ndis_device, wrap_ndis_work); WORKTRACE("0x%lx", wnd->wrap_ndis_pending_work); - if (test_bit(SHUTDOWN, &wnd->wrap_ndis_pending_work)) - WORKEXIT(return); - if (test_and_clear_bit(NETIF_WAKEQ, &wnd->wrap_ndis_pending_work)) { netif_tx_lock_bh(wnd->net_dev); netif_wake_queue(wnd->net_dev); @@ -1770,9 +1730,9 @@ net_dev = wnd->net_dev; get_supported_oids(wnd); + memset(mac, 0, sizeof(mac)); status = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, mac, sizeof(mac)); - if (status != NDIS_STATUS_SUCCESS || - memcmp(mac, "\x00\x00\x00\x00\x00\x00", sizeof(mac)) == 0) { + if (memcmp(mac, "\x00\x00\x00\x00\x00\x00", sizeof(mac)) == 0) { status = mp_query(wnd, OID_802_3_PERMANENT_ADDRESS, mac, sizeof(mac)); if (status != NDIS_STATUS_SUCCESS) { @@ -1781,10 +1741,10 @@ } } TRACE1("mac:" MACSTRSEP, MAC2STR(mac)); - memcpy(&net_dev->dev_addr, mac, ETH_ALEN); + memcpy(net_dev->dev_addr, mac, ETH_ALEN); strncpy(net_dev->name, if_name, IFNAMSIZ - 1); - net_dev->name[IFNAMSIZ - 1] = '\0'; + net_dev->name[IFNAMSIZ - 1] = 0; wnd->packet_filter = NDIS_PACKET_TYPE_DIRECTED | NDIS_PACKET_TYPE_BROADCAST | NDIS_PACKET_TYPE_MULTICAST; @@ -1952,7 +1912,6 @@ /* prevent setting essid during disassociation */ memset(&wnd->essid, 0, sizeof(wnd->essid)); - set_bit(SHUTDOWN, &wnd->wrap_ndis_pending_work); wnd->tx_ok = 0; if (wnd->max_tx_packets) unregister_netdev(wnd->net_dev); @@ -1968,13 +1927,12 @@ tx_pending = TX_RING_SIZE - 1; wnd->is_tx_ring_full = 0; /* throw away pending packets */ - while (tx_pending > 0) { + while (tx_pending-- > 0) { struct ndis_packet *packet; packet = wnd->tx_ring[wnd->tx_ring_start]; free_tx_packet(wnd, packet, NDIS_STATUS_CLOSING); wnd->tx_ring_start = (wnd->tx_ring_start + 1) % TX_RING_SIZE; - tx_pending--; } spin_unlock_bh(&wnd->tx_ring_lock); up(&wnd->tx_ring_mutex); @@ -2022,7 +1980,6 @@ } wd = pdo->reserved; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - SET_MODULE_OWNER(net_dev); if (wrap_is_pci_bus(wd->dev_bus)) SET_NETDEV_DEV(net_dev, &wd->pci.pdev->dev); if (wrap_is_usb_bus(wd->dev_bus)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ndiswrapper-1.49/ndiswrapper.spec new/ndiswrapper-1.51/ndiswrapper.spec --- old/ndiswrapper-1.49/ndiswrapper.spec 2007-10-28 07:18:44.000000000 +0100 +++ new/ndiswrapper-1.51/ndiswrapper.spec 2007-12-18 02:01:34.000000000 +0100 @@ -1,5 +1,5 @@ # Define ndiswrapper_version only if it is not already defined. -%{!?ndiswrapper_version: %define ndiswrapper_version 1.49} +%{!?ndiswrapper_version: %define ndiswrapper_version 1.51} %{!?ndiswrapper_release: %define ndiswrapper_release 1} # Define kernel version if not already defined ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit wine
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package wine checked in at Mon Dec 31 22:44:25 CET 2007. -------- --- arch/i386/wine/wine.changes 2007-12-14 22:17:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2007-12-29 00:24:32.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Dec 29 00:24:20 CET 2007 - meissner(a)suse.de + +- Upgraded to upstream 0.9.52 + - Improved graphics tablet support. + - Support for RPC context handles. + - Fixes for some longstanding screen depth issues. + - Implementation of "My Network Places" shell folder. + - Lots of bug fixes. + +------------------------------------------------------------------- Old: ---- wine-0.9.51.tar.bz2 New: ---- wine-0.9.52.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.d30715/_old 2007-12-31 22:44:16.000000000 +0100 +++ /var/tmp/diff_new_pack.d30715/_new 2007-12-31 22:44:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.51) +# spec file for package wine (Version 0.9.52) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ License: LGPL v2.1 or later Group: System/Emulators/PC AutoReqProv: on -Version: 0.9.51 +Version: 0.9.52 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -117,6 +117,13 @@ /usr/share/aclocal/wine.m4 %changelog +* Sat Dec 29 2007 - meissner(a)suse.de +- Upgraded to upstream 0.9.52 + - Improved graphics tablet support. + - Support for RPC context handles. + - Fixes for some longstanding screen depth issues. + - Implementation of "My Network Places" shell folder. + - Lots of bug fixes. * Fri Dec 14 2007 - meissner(a)suse.de - Upgraded to upstream 0.9.51 - A bunch of WinHelp improvements. ++++++ wine-0.9.51.tar.bz2 -> wine-0.9.52.tar.bz2 ++++++ arch/i386/wine/wine-0.9.51.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-0.9.52.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-qt
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package yast2-qt checked in at Mon Dec 31 22:43:43 CET 2007. -------- --- yast2-qt/yast2-qt.changes 2007-12-21 18:41:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-12-29 14:26:20.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Dec 29 14:25:32 CET 2007 - coolo(a)suse.de + +- some fixes in the package selector + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.r29575/_old 2007-12-31 22:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.r29575/_new 2007-12-31 22:43:33.000000000 +0100 @@ -11,7 +11,7 @@ Name: yast2-qt Version: 2.16.12 -Release: 1 +Release: 5 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,6 +78,8 @@ %_libdir/YaST2/plugin/libpy2qt_pkg.so %changelog +* Sat Dec 29 2007 - coolo(a)suse.de +- some fixes in the package selector * Fri Dec 21 2007 - coolo(a)suse.de - support `CurrentItem in timezone widget - fix combobox semantic ++++++ yast2-qt-2.16.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPackageSelectorBase.cc new/yast2-qt-2.16.12/src/pkg/YQPackageSelectorBase.cc --- old/yast2-qt-2.16.12/src/pkg/YQPackageSelectorBase.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPackageSelectorBase.cc 2007-12-29 14:26:18.000000000 +0100 @@ -230,7 +230,7 @@ if ( ! changes || ( QMessageBox::warning( this, "", _( "Abandon all changes?" ), - _( "&OK" ), _( "&Cancel" ), "", + _( "&Abandon" ), _( "&Cancel" ), "", 1, // defaultButtonNumber (from 0) 1 ) // escapeButtonNumber == 0 ) // Proceed upon button #0 ( OK ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPackageSelector.cc new/yast2-qt-2.16.12/src/pkg/YQPackageSelector.cc --- old/yast2-qt-2.16.12/src/pkg/YQPackageSelector.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPackageSelector.cc 2007-12-29 14:26:18.000000000 +0100 @@ -207,7 +207,7 @@ // Fire up the first dependency check in the main loop. // Don't do this right away - wait until all initializations are finished. QTimer::singleShot( 0, this, SLOT( resolveDependencies() ) ); - + } #endif } @@ -222,6 +222,7 @@ QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); Q_CHECK_PTR( outer_splitter ); + outer_splitter->setObjectName( "outer_splitter" ); layout->addWidget(outer_splitter); @@ -239,27 +240,23 @@ { QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); Q_CHECK_PTR( splitter ); + splitter->setObjectName( "leftpanesplitter" ); QWidget * upper_vbox = new QWidget( splitter ); QVBoxLayout *layout = new QVBoxLayout(upper_vbox); upper_vbox->setLayout(layout); - + layout->setMargin( 0 ); + layout->setSpacing( 0 ); + Q_CHECK_PTR( upper_vbox ); layoutFilters( upper_vbox ); addVSpacing( upper_vbox, MARGIN ); - QWidget * lower_vbox = new QWidget( splitter ); - layout = new QVBoxLayout(lower_vbox); - lower_vbox->setLayout(layout); - - addVSpacing( lower_vbox, MARGIN ); - _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); - Q_CHECK_PTR( _diskUsageList ); - layout->addWidget(_diskUsageList); - - splitter->setStretchFactor(splitter->indexOf(upper_vbox), 0); - splitter->setStretchFactor(splitter->indexOf(lower_vbox), 1); - + _diskUsageList = new YQPkgDiskUsageList( splitter ); + + splitter->setStretchFactor(splitter->indexOf(upper_vbox), 1); + splitter->setStretchFactor(splitter->indexOf( _diskUsageList ), 2); + return splitter; } @@ -418,14 +415,12 @@ YQPackageSelector::layoutRightPane( QWidget *parent ) { QWidget * right_pane_vbox = new QWidget( parent ); - - QVBoxLayout *layout = new QVBoxLayout(right_pane_vbox); - right_pane_vbox->setLayout(layout); + + QVBoxLayout *layout = new QVBoxLayout( right_pane_vbox ); Q_CHECK_PTR( right_pane_vbox ); layout->setMargin( MARGIN ); - QSplitter * splitter = new QSplitter( Qt::Vertical, right_pane_vbox ); Q_CHECK_PTR( splitter ); @@ -434,11 +429,11 @@ Q_CHECK_PTR( splitter ); layoutPkgList( splitter ); - addVSpacing( splitter, MARGIN ); + //addVSpacing( splitter, MARGIN ); layoutDetailsViews( splitter ); - layoutButtons( splitter ); + layoutButtons( right_pane_vbox ); return right_pane_vbox; } @@ -573,11 +568,12 @@ { QWidget * button_box = new QWidget( parent ); Q_CHECK_PTR( button_box ); + parent->layout()->addWidget( button_box ); QHBoxLayout *layout = new QHBoxLayout(button_box); - button_box->setLayout(layout); - layout->setSpacing( SPACING ); + //layout->setSpacing( SPACING ); + layout->setMargin( 0 ); // Button: Dependency check // Translators: Please keep this short! @@ -717,7 +713,7 @@ Q_CHECK_PTR( submenu ); submenu->addSeparator(); - + _pkgMenu->addAction(_pkgList->actionInstallListSourceRpms); _pkgMenu->addAction(_pkgList->actionDontInstallListSourceRpms); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPatternSelector.cc new/yast2-qt-2.16.12/src/pkg/YQPatternSelector.cc --- old/yast2-qt-2.16.12/src/pkg/YQPatternSelector.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPatternSelector.cc 2007-12-29 14:26:18.000000000 +0100 @@ -147,8 +147,8 @@ false, // no autoFill - need to connect to details view first false ); // no autoFilter - filterMatch() is not connected Q_CHECK_PTR( _patternList ); - layout->addWidget(_patternList); - _patternList->header()->hide(); + layout->addWidget(_patternList); + _patternList->header()->hide(); } if ( ! _patternList ) @@ -168,7 +168,7 @@ false, // no autoFill - need to connect to details view first false ); // no autoFilter - filterMatch() is not connected Q_CHECK_PTR( _selList ); - layout->addWidget(_selList); + layout->addWidget(_selList); _selList->header()->hide(); } @@ -182,11 +182,11 @@ QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); - layout->addLayout(hbox); + layout->addLayout(hbox); QPushButton * details_button = new QPushButton( _( "&Details..." ), vbox ); Q_CHECK_PTR( details_button ); - hbox->addWidget(details_button); + hbox->addWidget(details_button); connect( details_button, SIGNAL( clicked() ), this, SLOT ( detailedPackageSelection() ) ); @@ -212,31 +212,27 @@ // QWidget *upper_vbox = new QWidget(splitter); QVBoxLayout * layout = new QVBoxLayout(upper_vbox); - + Q_CHECK_PTR( upper_vbox ); _descriptionView = new YQPkgSelDescriptionView( upper_vbox ); Q_CHECK_PTR( _descriptionView ); layout->addWidget(_descriptionView); - layout->addSpacing( MARGIN ); - - // // Disk usage // QWidget *lower_vbox = new QWidget(splitter); - layout = new QVBoxLayout(upper_vbox); + layout = new QVBoxLayout( lower_vbox); Q_CHECK_PTR( lower_vbox ); - layout->addSpacing( MARGIN ); _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); Q_CHECK_PTR( _diskUsageList ); layout->addWidget(_diskUsageList); - splitter->setStretchFactor( 0, 0 ); + splitter->setStretchFactor( 0, 3 ); splitter->setStretchFactor( 0, 1 ); return splitter; @@ -248,14 +244,14 @@ YQPatternSelector::layoutButtons( QWidget * parent ) { QWidget *button_box = new QWidget(parent); + Q_CHECK_PTR( button_box ); + + parent->layout()->addWidget( button_box ); QHBoxLayout *layout = new QHBoxLayout(button_box); - Q_CHECK_PTR( button_box ); layout->setMargin ( MARGIN ); layout->setSpacing( SPACING ); - button_box->setLayout(layout); - QPushButton * details_button = new QPushButton( _( "&Details..." ), button_box ); layout->addWidget(details_button); Q_CHECK_PTR( details_button ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgChangesDialog.cc new/yast2-qt-2.16.12/src/pkg/YQPkgChangesDialog.cc --- old/yast2-qt-2.16.12/src/pkg/YQPkgChangesDialog.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgChangesDialog.cc 2007-12-29 14:26:18.000000000 +0100 @@ -121,7 +121,7 @@ QPushButton * button = new QPushButton( acceptButtonLabel, this ); Q_CHECK_PTR( button ); - layout->addWidget( button ); + hbox->addWidget( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), @@ -129,14 +129,13 @@ hbox->addStretch(); - if ( ! rejectButtonLabel.isEmpty() ) { // Reject button ( if desired ) - usually "Cancel" button = new QPushButton( rejectButtonLabel, this ); Q_CHECK_PTR( button ); - hbox->addWidget(button); + hbox->addWidget(button); connect( button, SIGNAL( clicked() ), this, SLOT ( reject() ) ); @@ -159,7 +158,7 @@ _pkgList->clear(); set<string> ignoredNames; - + if ( ! byUser || ! byApp ) ignoredNames = zypp::ui::userWantedPackageNames(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.cc new/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.cc --- old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.cc 2007-12-29 14:26:18.000000000 +0100 @@ -22,7 +22,10 @@ #include <QPixmap> #include <QDateTime> #include <QMessageBox> +#include <QRadioButton> #include <QList> +#include <QDebug> +#include <QVBoxLayout> #include <errno.h> @@ -56,12 +59,16 @@ YQPkgConflictList::YQPkgConflictList( QWidget * parent ) - : QY2ListView( parent ) + : QScrollArea( parent ), _layout( 0 ) { + setWidget( new QFrame( this ) ); + _layout = new QVBoxLayout; + widget()->setLayout( _layout ); + clear(); - setHeaderLabel( _( "Dependency Conflict" ) ); - setRootIsDecorated( true ); - setSortByInsertionSequence( true ); + //setHeaderLabel( _( "Dependency Conflict" ) ); + //setRootIsDecorated( true ); + //setSortByInsertionSequence( true ); } @@ -70,6 +77,19 @@ // NOP } +void +YQPkgConflictList::clear() +{ + YQPkgConflict * conflict; + foreach( conflict, _conflicts ) + { + _layout->removeWidget( conflict ); + delete conflict; + } + _conflicts.clear(); + // kill the stretch item too + delete _layout->takeAt( 0 ); +} void YQPkgConflictList::fill( zypp::ResolverProblemList problemList ) @@ -77,16 +97,27 @@ clear(); string text; + // for some weired reason, the layout's minSize is still 18x18 even after 3000 pixels + // inserted, so we have to do the math on our own + QSize minSize = QSize( _layout->margin() * 2, _layout->margin() * 2 ); zypp::ResolverProblemList::iterator it = problemList.begin(); while ( it != problemList.end() ) { - YQPkgConflict * conflict = new YQPkgConflict( this, *it ); + YQPkgConflict *conflict = new YQPkgConflict( widget(), *it ); Q_CHECK_PTR( conflict ); + minSize = minSize.expandedTo( conflict->minimumSizeHint() ); + minSize.rheight() += conflict->minimumSizeHint().height() + _layout->spacing(); + _layout->addWidget( conflict ); + _conflicts.push_back( conflict ); ++it; } + _layout->addStretch( 1 ); + + widget()->resize( minSize ); + setWidgetResizable( false ); } @@ -95,26 +126,16 @@ { zypp::ProblemSolutionList userChoices; - int count=0; - QTreeWidgetItem * child; - - while ( (child = topLevelItem(count)) ) + YQPkgConflict *conflict; + foreach( conflict, _conflicts ) { - YQPkgConflict * conflict = dynamic_cast<YQPkgConflict *> (child); + zypp::ProblemSolution_Ptr userChoice = conflict->userSelectedResolution(); - if ( conflict ) - { - zypp::ProblemSolution_Ptr userChoice = conflict->userSelectedResolution(); - - if ( userChoice ) - userChoices.push_back( userChoice ); - } - - count++; + if ( userChoice ) + userChoices.push_back( userChoice ); } zypp::getZYpp()->resolver()->applySolutions( userChoices ); - emit updatePackages(); } @@ -133,9 +154,10 @@ void YQPkgConflictList::saveToFile( const QString filename, bool interactive ) const { +#if 0 // Open file QFile file(filename); - + if ( ! file.open(QIODevice::WriteOnly) ) { y2error( "Can't open file %s", qPrintable(filename) ); @@ -184,12 +206,14 @@ if ( file.isOpen() ) file.close(); + +#endif } void YQPkgConflictList::saveItemToFile( QFile &file, - const QTreeWidgetItem * item ) const + const YQPkgConflict * item ) const { #if FIXME if ( ! item || ! file.isOpen() ) @@ -207,7 +231,7 @@ { switch ( checkListItem->type() ) { - QString buffer; + QString buffer; case Q3CheckListItem::CheckBox: buffer.sprintf( "[%c] ", checkListItem->( checkState(0) == Qt::Checked ) ? 'x' : ' ' ); break; @@ -238,178 +262,96 @@ #endif } - -void -YQPkgConflictList::dumpList( QTreeWidgetItem * parent, - const QString & longText, - const QString & header, - int splitThreshold ) -{ - if ( ! parent ) - { - y2error( "Null parent" ); - return; - } - - if ( longText.isEmpty() ) - return; - -#if FIXME - if ( ! header.isEmpty() ) - { - parent = new QY2ListViewItem( parent, header ); - Q_CHECK_PTR( parent ); - parent->setExpanded( true ); - } - - QStringList lines = QStringList::split( '\n', longText, - true ); // allowEmptyEntries - QList<QString>::const_iterator it = lines.begin(); - - bool doSplit = splitThreshold > 1 && lines.size() > splitThreshold + 3; - bool didSplit = false; - int count = 0; - - - while ( it != lines.end() ) - { - if ( doSplit && ! didSplit && ++count > splitThreshold ) - { - // Split list - - int more = lines.size() - count + 1; - QString text = ( _( "%1 more..." ) ).arg( more ); - QY2ListViewItem * sublist = new QY2ListViewItem( parent, text ); - didSplit = true; - - if ( sublist ) - { - sublist->setBackgroundColor( LIGHT_ORANGE ); - parent = sublist; - } - } - - new QY2ListViewItem( parent, *it ); - ++it; - } -#endif -} - - - - - - - -YQPkgConflict::YQPkgConflict( YQPkgConflictList * parentList, +YQPkgConflict::YQPkgConflict( QWidget * parent, zypp::ResolverProblem_Ptr problem ) - : QY2ListViewItem( parentList ) + : QFrame( parent ) , _problem( problem ) , _resolutionsHeader( 0 ) { - setBackgroundColor( LIGHT_BLUE ); - setExpanded( true ); - + _layout = new QVBoxLayout( this ); + _layout->setSpacing( 0 ); + _layout->setMargin( 0 ); formatHeading(); - YQPkgConflictList::dumpList( this, fromUTF8( _problem->details() ) ); + QLabel *label = new QLabel( fromUTF8 ( _problem->details() ), this ); + _layout->addWidget( label ); + //YQPkgConflictList::dumpList( this, ); addSolutions(); + setMinimumSize( _layout->minimumSize() ); } void YQPkgConflict::formatHeading() { - QString text; - QPixmap icon = YQIconPool::normalPkgConflict(); - setTextColor( BRIGHT_RED ); + QFrame *frame = new QFrame( this ); + QHBoxLayout *hbox = new QHBoxLayout(frame); + + QLabel *pix = new QLabel( this ); + pix->setPixmap( YQIconPool::normalPkgConflict() ); + + hbox->addWidget( pix ); - setData( 0, Qt::DisplayRole, fromUTF8( problem()->description() ) ); - setData( 0, Qt::DecorationRole, icon ); + QString text = fromUTF8( problem()->description() ); + QLabel *heading = new QLabel( text, this ); + heading->setStyleSheet( "font-size: +2; color: red; font: bold;" ); + hbox->addWidget( heading ); + hbox->addStretch( 1 ); + + frame->setStyleSheet( "background-color: lightgray;" ); + _layout->addWidget(frame); } void YQPkgConflict::addSolutions() { - _resolutionsHeader = new QY2CheckListItem( this, - // Heading for the choices - // how to resolve this conflict - _( "Conflict Resolution:" ) ); + // Heading for the choices + // how to resolve this conflict + _resolutionsHeader = new QLabel( _( "Conflict Resolution:" ), this ); + _layout->addWidget( _resolutionsHeader ); Q_CHECK_PTR( _resolutionsHeader ); - _resolutionsHeader->setExpanded( true ); - _resolutionsHeader->setBackgroundColor( LIGHT_GREY ); - zypp::ProblemSolutionList solutions = problem()->solutions(); zypp::ProblemSolutionList::iterator it = solutions.begin(); + QHBoxLayout *hbox = new QHBoxLayout(); + hbox->addSpacing( 20 ); + + QVBoxLayout *vbox = new QVBoxLayout(); + hbox->addLayout( vbox ); + _layout->addLayout( hbox ); + while ( it != solutions.end() ) { - YQPkgConflictResolution * solution = new YQPkgConflictResolution( _resolutionsHeader, *it ); - Q_CHECK_PTR( solution ); - //FIXME solution->setExpanded(true); + QRadioButton * s = new QRadioButton( fromUTF8( ( *it )->description() ), this ); + Q_CHECK_PTR( s ); + _solutions[ s ] = *it; + vbox->addWidget( s ); ++it; } } - -// void -// YQPkgConflict::paintCell( QPainter * painter, -// const QColorGroup & colorGroup, -// int column, -// int width, -// int alignment ) -// { -// painter->setFont( YQUI::yqApp()->headingFont() ); -// #if FIXME -// QY2ListViewItem::paintCell( painter, colorGroup, column, width, alignment ); -// #endif -// } - - zypp::ProblemSolution_Ptr YQPkgConflict::userSelectedResolution() { - QTreeWidgetItem * item; - QTreeWidgetItemIterator it(_resolutionsHeader); + QMap<QRadioButton*, zypp::ProblemSolution_Ptr>::iterator it; - while ( (item = *it) ) + for ( it = _solutions.begin(); it != _solutions.end(); ++it ) { - YQPkgConflictResolution * res = dynamic_cast<YQPkgConflictResolution *> (item); - - if ( res && ( res->checkState(0) == Qt::Checked ) ) - { - zypp::ProblemSolution_Ptr solution = res->solution(); - - y2milestone( "User selected resolution \"%s\" for problem \"%s\"", - solution->description().c_str(), - solution->problem()->description().c_str() ); - return solution; - } - - ++it; + QRadioButton *button = it.key(); + if ( !button->isChecked() ) + continue; + zypp::ProblemSolution_Ptr solution = it.value(); + + y2milestone( "User selected resolution \"%s\" for problem \"%s\"", + solution->description().c_str(), + solution->problem()->description().c_str() ); + return solution; } return zypp::ProblemSolution_Ptr(); // Null pointer } - - - - - -YQPkgConflictResolution::YQPkgConflictResolution( QY2CheckListItem * parent, - zypp::ProblemSolution_Ptr solution ) - : QY2CheckListItem( parent, - fromUTF8( solution->description() ) ) - /*, Q3CheckListItem::RadioButton) */ -{ - _solution = solution; - YQPkgConflictList::dumpList( this, fromUTF8( solution->details() ) ); -} - - - #include "YQPkgConflictList.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.h new/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.h --- old/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.h 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgConflictList.h 2007-12-29 14:26:18.000000000 +0100 @@ -24,13 +24,14 @@ #include <stdio.h> #include <QMap> #include <QFile> -#include "QY2ListView.h" +#include <QScrollArea> #include <zypp/Resolver.h> #include <zypp/ResolverProblem.h> #include <zypp/ProblemSolution.h> - +class QVBoxLayout; +class QRadioButton; class QAction; class YQPkgConflict; class YQPkgConflictResolution; @@ -41,7 +42,7 @@ * @short Display package dependency conflicts in a tree list and let the user * choose how to resolve each conflict. **/ -class YQPkgConflictList : public QY2ListView +class YQPkgConflictList : public QScrollArea { Q_OBJECT @@ -64,12 +65,12 @@ /** * Check if the conflict list is empty. **/ - bool isEmpty() const { return topLevelItemCount() == 0; } + bool isEmpty() const { return count() == 0; } /** * Returns the number of conflicts in the list. **/ - int count() const { return topLevelItemCount(); } + int count() const { return _conflicts.count(); } public slots: @@ -89,6 +90,7 @@ **/ void askSaveToFile() const; + void clear(); public: @@ -102,25 +104,15 @@ **/ void saveToFile( const QString filename, bool interactive ) const; - /** - * Dump a multi-line text to a QListView as a sequence of separate items. - * If 'longText' has considerably more lines than 'splitThreshold', fold - * all lines from no. 'splitThreshold' on into a closed list item - * "More...". - * If 'header' is not empty, it will be added as the parent of the lines. - **/ - static void dumpList( QTreeWidgetItem * parent, - const QString & longText, - const QString & header = QString::null, - int splitThreshold = 3 ); - protected: /** * (Recursively) save one item to file. **/ - void saveItemToFile( QFile &file, const QTreeWidgetItem * item ) const; + void saveItemToFile( QFile &file, const YQPkgConflict * item ) const; + QList<YQPkgConflict*> _conflicts; + QVBoxLayout *_layout; signals: @@ -128,6 +120,7 @@ * Update package states - they may have changed. **/ void updatePackages(); + }; @@ -135,14 +128,16 @@ /** * @short Root item for each individual conflict **/ -class YQPkgConflict: public QY2ListViewItem +class YQPkgConflict: public QFrame { + Q_OBJECT + public: /** * Constructor. **/ - YQPkgConflict( YQPkgConflictList * parentList, + YQPkgConflict( QWidget *parent, zypp::ResolverProblem_Ptr problem ); /** @@ -174,49 +169,13 @@ **/ void addSolutions(); - /** - * Paint method. Reimplemented from @ref QListViewItem so a different - * font can be used. - * - * Reimplemented from QY2ListViewItem. - **/ -// virtual void paintCell( QPainter * painter, -// const QColorGroup & colorGroup, -// int column, -// int width, -// int alignment ); - - // Data members zypp::ResolverProblem_Ptr _problem; - QY2CheckListItem * _resolutionsHeader; -}; - - - -class YQPkgConflictResolution: public QY2CheckListItem -{ -public: - - /** - * Constructor - **/ - YQPkgConflictResolution( QY2CheckListItem * parent, - zypp::ProblemSolution_Ptr _solution ); - - /** - * Return the corresponding ProblemSolution. - **/ - zypp::ProblemSolution_Ptr solution() const { return _solution; } - - -protected: - - // Data members - - zypp::ProblemSolution_Ptr _solution; + QLabel * _resolutionsHeader; + QList<zypp::ProblemSolution_Ptr> _resolutions; + QMap<QRadioButton*, zypp::ProblemSolution_Ptr> _solutions; + QVBoxLayout *_layout; }; - #endif // ifndef YQPkgConflictList_h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgDiskUsageList.cc new/yast2-qt-2.16.12/src/pkg/YQPkgDiskUsageList.cc --- old/yast2-qt-2.16.12/src/pkg/YQPkgDiskUsageList.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgDiskUsageList.cc 2007-12-29 14:26:18.000000000 +0100 @@ -86,7 +86,18 @@ _items.insert( QString::fromUtf8(partitionDu.dir.c_str()), item ); } } - + resizeColumnToContents( nameCol() ); + resizeColumnToContents( usedSizeCol() ); + resizeColumnToContents( freeSizeCol() ); + resizeColumnToContents( totalSizeCol() ); + + sortByColumn( percentageBarCol(), Qt::DescendingOrder ); + + header()->setResizeMode( percentageBarCol(), QHeaderView::Stretch ); + header()->setResizeMode( totalSizeCol(), QHeaderView::Fixed ); + header()->setResizeMode( nameCol(), QHeaderView::ResizeToContents ); + header()->setResizeMode( usedSizeCol(), QHeaderView::ResizeToContents ); + header()->setResizeMode( freeSizeCol(), QHeaderView::ResizeToContents ); } @@ -111,9 +122,7 @@ y2error( "No entry for mount point %s", partitionDu.dir.c_str() ); } -#if FIXME - sort(); -#endif + resizeColumnToContents( totalSizeCol() ); postPendingWarnings(); } @@ -148,6 +157,8 @@ QSize YQPkgDiskUsageList::sizeHint() const { + QFontMetrics fms( font() ); + return QSize( fms.width( "/var/usr/home 100% 100.32GB" ) + 50, 100 ); #ifdef FIXME int width = header()->headerWidth() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgList.cc new/yast2-qt-2.16.12/src/pkg/YQPkgList.cc --- old/yast2-qt-2.16.12/src/pkg/YQPkgList.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgList.cc 2007-12-29 14:26:18.000000000 +0100 @@ -27,6 +27,9 @@ #include <QMenu> #include <QMessageBox> #include <QFile> +#include <QTreeView> +#include <QDebug> +#include <QHeaderView> #include "utf8.h" @@ -45,9 +48,8 @@ int numCol = 0; QStringList headers; - + headers << ""; _statusCol = numCol++; - // _statusCol = numCol; headers << _( "Package" ); _nameCol = numCol++; headers << _( "Summary" ); _summaryCol = numCol++; @@ -70,11 +72,29 @@ headers << _( "Source" ); _srpmStatusCol = numCol++; #endif setHeaderLabels(headers); - saveColumnWidths(); - //FIXME sort( nameCol() ); - //FIXME setColumnAlignment( sizeCol(), Qt::AlignRight ); + + setSortingEnabled( true ); + header()->setSortIndicatorShown( true ); + header()->setClickable( true ); + + sortByColumn( nameCol(), Qt::AscendingOrder ); + setAllColumnsShowFocus( true ); + setIconSize( QSize( 22, 16 ) ); + // resize to minimum + setColumnWidth( statusCol(), 25 ); + QFontMetrics fms( font() ); + setColumnWidth( sizeCol(), fms.width( "8780.2 K" ) ); + setColumnWidth( instVersionCol(), fms.width( " 20071220pre" ) ); + setColumnWidth( versionCol(), fms.width( " 20071220pre" ) ); + setColumnWidth( nameCol(), fms.width( "opensuse-release " ) ); + setColumnWidth( summaryCol(), fms.width( "A really really long text, but not too long" ) ); + + header()->setResizeMode( QHeaderView::Interactive ); + + saveColumnWidths(); + createActions(); createSourceRpmContextMenu(); @@ -437,7 +457,7 @@ if ( instVersion.isEmpty() ) instVersion = "---"; QString status = "[" + statusText( pkg->status() ) + "]"; - QString format; + QString format; format.sprintf("%-20s %-30s | %10s | %-16s | %-16s\n", (const char *) status.toUtf8(), (const char *) pkg->text( nameCol() ), @@ -445,7 +465,7 @@ (const char *) candVersion, (const char *) instVersion ); - file.write(format.toUtf8()); + file.write(format.toUtf8()); } item = item->nextSibling(); @@ -455,7 +475,7 @@ // Clean up if ( file.isOpen() ) - file.close(); + file.close(); } @@ -552,6 +572,9 @@ _zyppPkg = tryCastToZyppPkg( selectable->theObj() ); setSourceRpmIcon(); + + setTextAlignment( sizeCol(), Qt::AlignRight ); + setSizeHint( sizeCol(), QSize( QFontMetrics( pkgList->font() ).width( text( sizeCol() ) ), 10 ) ); } @@ -731,11 +754,11 @@ bool YQPkgListItem::operator< ( const QTreeWidgetItem & otherListViewItem ) const { + const YQPkgListItem * other = dynamic_cast<const YQPkgListItem *> (&otherListViewItem); + int col = treeWidget()->sortColumn(); if ( col == srpmStatusCol() ) { - const YQPkgListItem * other = dynamic_cast<const YQPkgListItem *> (&otherListViewItem); - if ( other ) { int thisPoints = ( this->hasSourceRpm() ? 1 : 0 ) + ( this->installSourceRpm() ? 1 : 0 ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgObjList.cc new/yast2-qt-2.16.12/src/pkg/YQPkgObjList.cc --- old/yast2-qt-2.16.12/src/pkg/YQPkgObjList.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgObjList.cc 2007-12-29 14:26:18.000000000 +0100 @@ -24,8 +24,8 @@ #include <QHeaderView> #include <QMenu> #include <QAction> -//Added by qt3to4: -#include <qevent.h> +#include <QDebug> +#include <QKeyEvent> #include "utf8.h" @@ -90,6 +90,7 @@ connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), this, SLOT ( currentItemChangedInternal( QTreeWidgetItem * ) ) ); + } @@ -128,7 +129,6 @@ if ( sizeCol() >= 0 && size > 0L ) { QString sizeStr = size.form().c_str(); - sizeStr += " "; item->setText( sizeCol(), sizeStr ); } } @@ -366,7 +366,7 @@ //item->setSelected( false ); // Doesn't emit signals scrollToItem( *it ); // Scroll if necessary setCurrentItem( *it ); // Emits signals - + } } @@ -775,7 +775,6 @@ } } - void YQPkgObjList::applyExcludeRules( QTreeWidgetItem * listViewItem ) { @@ -924,7 +923,7 @@ zypp::ByteCount size = zyppObj()->size(); if ( size > 0L ) - setText( sizeCol(), size.asString() + " " ); + setText( sizeCol(), size.asString() ); } if ( instVersionCol() >= 0 ) @@ -947,6 +946,7 @@ setText( versionCol(), zyppObj()->edition() ); } + setStatusIcon(); } @@ -1048,14 +1048,14 @@ if ( statusCol() >= 0 ) { bool enabled = editable() && _pkgObjList->editable(); - setData( statusCol(), Qt::DecorationRole, _pkgObjList->statusIcon( status(), enabled, bySelection() ) ); + setIcon( statusCol(), _pkgObjList->statusIcon( status(), enabled, bySelection() ) ); } if ( brokenIconCol() >= 0 ) { // Reset this icon now - it might be the same column as satisfiedIconCol() - setData( brokenIconCol(), Qt::DecorationRole, QPixmap() ); + setIcon( brokenIconCol(), QPixmap() ); } if ( satisfiedIconCol() >= 0 ) @@ -1064,7 +1064,7 @@ // but satisfied anyway (e.g. for patches or patterns where the user // selected all required packages manually) - setData( satisfiedIconCol(), Qt::DecorationRole, isSatisfied() ? YQIconPool::pkgSatisfied() : QPixmap() ); + setIcon( satisfiedIconCol(), isSatisfied() ? YQIconPool::pkgSatisfied() : QPixmap() ); } if ( brokenIconCol() >= 0 ) @@ -1074,7 +1074,7 @@ if ( isBroken() ) { - setData( brokenIconCol(), Qt::DecorationRole, YQIconPool::warningSign() ); + setIcon( brokenIconCol(), YQIconPool::warningSign() ); y2warning( "Broken object: %s - %s", _selectable->theObj()->name().c_str(), _selectable->theObj()->summary().c_str() ); @@ -1380,7 +1380,7 @@ if ( col == sizeCol() ) { // Numeric sort by size - + return ( this->zyppObj()->size() < other->zyppObj()->size() ); } else if ( col == statusCol() ) @@ -1391,7 +1391,10 @@ // dangerous or noteworthy states first - e.g., "taboo" which should // seldeom occur, but when it does, it is important. - return ( this->status() < other->status() ); + bool b = ( this->status() < other->status() ); + if ( !b && this->status() == other->status() ) + b = this->zyppObj()->name() < other->zyppObj()->name(); + return b; } else if ( col == instVersionCol() || col == versionCol() ) @@ -1439,9 +1442,6 @@ _excluded = excl; } - - - YQPkgObjList::ExcludeRule::ExcludeRule( YQPkgObjList * parent, const QRegExp & regexp, int column ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/pkg/YQPkgPatternList.cc new/yast2-qt-2.16.12/src/pkg/YQPkgPatternList.cc --- old/yast2-qt-2.16.12/src/pkg/YQPkgPatternList.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/pkg/YQPkgPatternList.cc 2007-12-29 14:26:18.000000000 +0100 @@ -139,7 +139,6 @@ _categories.insert( categoryName, cat ); } - return cat; } @@ -342,11 +341,6 @@ return QTreeWidgetItem::operator<( otherListViewItem ); } - - - - - YQPkgPatternCategoryItem::YQPkgPatternCategoryItem( YQPkgPatternList * patternList, const QString & category ) : QY2ListViewItem( patternList ) @@ -390,10 +384,10 @@ void YQPkgPatternCategoryItem::setTreeIcon() { - setData( _patternList->statusCol(), Qt::DecorationRole, - isExpanded() ? - YQIconPool::treeMinus() : - YQIconPool::treePlus() ); + setIcon( _patternList->statusCol(), + isExpanded() ? + YQIconPool::treeMinus() : + YQIconPool::treePlus() ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/QY2ComboTabWidget.cc new/yast2-qt-2.16.12/src/QY2ComboTabWidget.cc --- old/yast2-qt-2.16.12/src/QY2ComboTabWidget.cc 2007-12-21 18:41:52.000000000 +0100 +++ new/yast2-qt-2.16.12/src/QY2ComboTabWidget.cc 2007-12-29 14:26:17.000000000 +0100 @@ -42,26 +42,25 @@ const char * name ) : QWidget(parent) { - QVBoxLayout *vbox = new QVBoxLayout(); - setLayout(vbox); + QVBoxLayout *vbox = new QVBoxLayout(this); + vbox->setMargin( 0 ); QHBoxLayout *hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); // hbox->setFrameStyle( QFrame::Panel | QFrame::Raised ); // hbox->setLineWidth(2); // hbox->setMidLineWidth(2); - hbox->setSpacing( SPACING ); - hbox->setMargin ( MARGIN ); + hbox->setSpacing( 0 ); + hbox->setMargin ( 0 ); vbox->addLayout(hbox); //this->setSpacing( SPACING ); - this->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert - + this->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); // hor/vert combo_label = new QLabel(label); hbox->addWidget(combo_label); Q_CHECK_PTR( combo_label ); - + combo_box = new QComboBox( this ); Q_CHECK_PTR( combo_box ); hbox->addWidget(combo_box); @@ -69,7 +68,7 @@ combo_box->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert connect( combo_box, SIGNAL( activated( int ) ), this, SLOT ( showPageIndex ( int ) ) ); - + widget_stack = new QStackedWidget( this ); Q_CHECK_PTR( widget_stack ); vbox->addWidget(widget_stack); @@ -79,7 +78,7 @@ QY2ComboTabWidget::~QY2ComboTabWidget() { - + } @@ -125,9 +124,9 @@ // correct combo box item. return; } - + // Search the dict for this page - + QHashIterator<int, QWidget *> it( pages ); while ( it.hasNext() ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/QY2DiskUsageList.cc new/yast2-qt-2.16.12/src/QY2DiskUsageList.cc --- old/yast2-qt-2.16.12/src/QY2DiskUsageList.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/QY2DiskUsageList.cc 2007-12-29 14:26:19.000000000 +0100 @@ -132,14 +132,12 @@ QY2DiskUsageListItem *item = dynamic_cast<QY2DiskUsageListItem *>(_view->itemFromIndex(index)); if ( item ) { - item->paintPercentageBar( item->usedPercent(), - painter, + item->paintPercentageBar( painter, option, interpolateColor( item->usedPercent(), - 60, 95, - QColor( 0, 0x80, 0 ), // Medium dark green - QColor( 0xFF, 0, 0 ) ), // Bright red - background.dark( 115 ) ); + 60, 95, + QColor( 0, 0xa0, 0 ), // Medium dark green + QColor( 0xFF, 0, 0 ) ) ); // Bright red } painter->restore(); } @@ -150,7 +148,6 @@ { _nameCol = -42; _percentageBarCol = -42; - _percentageCol = -42; _usedSizeCol = -42; _freeSizeCol = -42; _totalSizeCol = -42; @@ -163,7 +160,6 @@ columnLabels << _( "Name" ); _nameCol = numCol++; // Translators: Please keep this short! columnLabels << _("Disk Usage"); _percentageBarCol = numCol++; - columnLabels << ""; _percentageCol = numCol++; setItemDelegateForColumn( _percentageBarCol, new QY2DiskUsagePercentageItem( this ) ); columnLabels << _("Used"); _usedSizeCol = numCol++; columnLabels << _( "Free"); _freeSizeCol = numCol++; @@ -175,12 +171,8 @@ setColumnCount(numCol); setHeaderLabels(columnLabels); - //FIXME -// setTextAlignment( percentageCol(), Qt::AlignRight ); -// setTextAlignment( usedSizeCol(), Qt::AlignRight ); -// setTextAlignment( freeSizeCol(), Qt::AlignRight ); -// setTextAlignment( totalSizeCol(), Qt::AlignRight ); sortItems( percentageBarCol(), Qt::AscendingOrder ); + setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); } saveColumnWidths(); @@ -222,12 +214,11 @@ void QY2DiskUsageListItem::init( bool allFields ) { - if ( percentageCol() >= 0 ) - { - QString percentageText; - percentageText.sprintf( "%d%%", usedPercent() ); - setText( percentageCol(), percentageText ); - } + setSizeHint( percentageBarCol(), QSize( 20, 10 ) ); + + setTextAlignment( usedSizeCol(), Qt::AlignRight ); + setTextAlignment( freeSizeCol(), Qt::AlignRight ); + setTextAlignment( totalSizeCol(), Qt::AlignRight ); if ( usedSizeCol() >= 0 ) setText( usedSizeCol(), usedSize() ); if ( freeSizeCol() >= 0 ) setText( freeSizeCol(), freeSize() ); @@ -235,7 +226,7 @@ if ( allFields ) { if ( totalSizeCol() >= 0 ) setText( totalSizeCol(), totalSize() ); - if ( nameCol() >= 0 ) setText( nameCol(), " " + name() ); + if ( nameCol() >= 0 ) setText( nameCol(), name() ); if ( deviceNameCol() >= 0 ) setText( deviceNameCol(), deviceName() ); } } @@ -245,7 +236,6 @@ QY2DiskUsageListItem::setText( int column, const FSize & size ) { QString sizeText = size.form( 0, 1, true ).c_str(); - sizeText += " "; setText( column, sizeText ); } @@ -290,7 +280,7 @@ * Comparison function used for sorting the list. * Reimplemented from QTreeWidgetItem **/ -bool +bool QY2DiskUsageListItem::operator<( const QTreeWidgetItem & otherListViewItem ) const { const QY2DiskUsageListItem * other = dynamic_cast<const QY2DiskUsageListItem *> (&otherListViewItem); @@ -298,8 +288,7 @@ if ( other ) { - if ( col == percentageCol() || - col == percentageBarCol() ) + if ( col == percentageBarCol() ) { // Intentionally reverting sort order: Fullest first return ( this->usedPercent() < other->usedPercent() ); @@ -325,91 +314,44 @@ * Stolen from KDirStat::KDirTreeView with the author's permission. **/ void -QY2DiskUsageListItem::paintPercentageBar( float percent, - QPainter * painter, +QY2DiskUsageListItem::paintPercentageBar( QPainter * painter, QStyleOptionViewItem option, - const QColor & fillColor, - const QColor & barBackground ) + const QColor & fillColor ) { - if ( percent > 100.0 ) percent = 100.0; - if ( percent < 0.0 ) percent = 0.0; - int penWidth = 2; - int extraMargin = 3; - int x = option.rect.left(); /*FIXME _diskUsageList->itemMargin(); */ - int y = option.rect.top() + extraMargin; - int w = option.rect.width() - 2; /*FIXME * _diskUsageList->horizontalOffset(); */ - int h = option.rect.height() - 2; /*FIXME * extraMargin; */ - int fillWidth; - - painter->eraseRect( option.rect ); - int indent=0; - w -= indent; - x += indent; - - if ( w > 0 ) - { - QPen pen( painter->pen() ); - pen.setWidth(0); - painter->setPen( pen ); - painter->setBrush( Qt::NoBrush ); - fillWidth = (int) ( ( w - 2 * penWidth ) * percent / 100.0 ); - - - // Fill bar background. - - painter->fillRect( x + penWidth, y + penWidth, - w - 2 * penWidth + 1, h - 2 * penWidth + 1, - barBackground ); - /* - * Notice: The Xlib XDrawRectangle() function always fills one - * pixel less than specified. Altough this is very likely just a - * plain old bug, it is documented that way. Obviously, Qt just - * maps the fillRect() call directly to XDrawRectangle() so they - * inherited that bug ( although the Qt doc stays silent about - * it ). So it is really necessary to compensate for that missing - * pixel in each dimension. - * - * If you don't believe it, see for yourself. - * Hint: Try the xmag program to zoom into the drawn pixels. - **/ + float percent = usedPercent(); + if ( percent > 100.0 ) percent = 100.0; + if ( percent < 0.0 ) percent = 0.0; + int x = option.rect.left() + 1; + int y = option.rect.top() + 1; + int w = option.rect.width() - 2; + int h = option.rect.height() - 2; + int fillWidth = 0; + + if ( w > 0 ) + { + fillWidth = (int) ( w * usedPercent() / 100.0 ); // Fill the desired percentage. - painter->fillRect( x + penWidth, y + penWidth, - fillWidth+1, h - 2 * penWidth+1, + painter->fillRect( x, y, fillWidth, h, fillColor ); + QString percentageText; + percentageText.sprintf( "%d%%", usedPercent() ); - // Draw 3D shadows. + if ( usedPercent() > 50 ) { + painter->setPen( treeWidget()->palette().color( QPalette::Base ) ); + painter->drawText( QRect( x, y, + fillWidth - 3, h ), + Qt::AlignRight, percentageText ); + } else { + painter->setPen( treeWidget()->palette().color( QPalette::Text ) ); + painter->drawText( QRect( x + fillWidth + 3, y, + w - fillWidth - 3, h ), + Qt::AlignLeft, percentageText ); - pen.setColor( contrastingColor ( Qt::black, - painter->background().color() ) ); - painter->setPen( pen ); - painter->drawLine( x, y, x+w, y ); - painter->drawLine( x, y, x, y+h ); - - pen.setColor( contrastingColor( barBackground.dark(), - painter->background().color() ) ); - painter->setPen( pen ); - painter->drawLine( x+1, y+1, x+w-1, y+1 ); - painter->drawLine( x+1, y+1, x+1, y+h-1 ); - - pen.setColor( contrastingColor( barBackground.light(), - painter->background().color() ) ); - painter->setPen( pen ); - painter->drawLine( x+1, y+h, x+w, y+h ); - painter->drawLine( x+w, y, x+w, y+h ); - - pen.setColor( contrastingColor( Qt::white, - painter->background().color() ) ); - painter->setPen( pen ); - painter->drawLine( x+2, y+h-1, x+w-1, y+h-1 ); - painter->drawLine( x+w-1, y+1, x+w-1, y+h-1 ); - } + } + } } - - - - #include "QY2DiskUsageList.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/QY2DiskUsageList.h new/yast2-qt-2.16.12/src/QY2DiskUsageList.h --- old/yast2-qt-2.16.12/src/QY2DiskUsageList.h 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/QY2DiskUsageList.h 2007-12-29 14:26:17.000000000 +0100 @@ -57,7 +57,6 @@ int nameCol() const { return _nameCol; } int percentageBarCol() const { return _percentageBarCol; } - int percentageCol() const { return _percentageCol; } int usedSizeCol() const { return _usedSizeCol; } int freeSizeCol() const { return _freeSizeCol; } int totalSizeCol() const { return _totalSizeCol; } @@ -74,7 +73,6 @@ int _nameCol; int _percentageBarCol; - int _percentageCol; int _usedSizeCol; int _freeSizeCol; int _totalSizeCol; @@ -200,7 +198,6 @@ int nameCol() const { return _diskUsageList->nameCol(); } int percentageBarCol() const { return _diskUsageList->percentageBarCol(); } - int percentageCol() const { return _diskUsageList->percentageCol(); } int usedSizeCol() const { return _diskUsageList->usedSizeCol(); } int freeSizeCol() const { return _diskUsageList->freeSizeCol(); } int totalSizeCol() const { return _diskUsageList->totalSizeCol(); } @@ -234,13 +231,11 @@ * * Stolen from KDirStat::KDirTreeView with the author's permission. **/ - void paintPercentageBar( float percent, - QPainter * painter, + void paintPercentageBar( QPainter * painter, QStyleOptionViewItem option, - const QColor & fillColor, - const QColor & barBackground ); + const QColor & fillColor); - protected: +protected: // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/QY2ListView.cc new/yast2-qt-2.16.12/src/QY2ListView.cc --- old/yast2-qt-2.16.12/src/QY2ListView.cc 2007-12-21 18:41:52.000000000 +0100 +++ new/yast2-qt-2.16.12/src/QY2ListView.cc 2007-12-29 14:26:17.000000000 +0100 @@ -367,7 +367,7 @@ bool QY2ListViewItem::operator< ( const QTreeWidgetItem & otherListViewItem ) const { - bool sortByInsertionSequence = false; + bool sortByInsertionSequence = false; QY2ListView * parentListView = dynamic_cast<QY2ListView *> (treeWidget()); if ( parentListView ) @@ -429,6 +429,9 @@ _serial = 0; QY2ListView * parentListView = dynamic_cast<QY2ListView *> ( treeWidget() ); + setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); + setCheckState(0, Qt::Unchecked); + if ( parentListView ) _serial = parentListView->nextSerial(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/YQComboBox.cc new/yast2-qt-2.16.12/src/YQComboBox.cc --- old/yast2-qt-2.16.12/src/YQComboBox.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/YQComboBox.cc 2007-12-29 14:26:17.000000000 +0100 @@ -95,7 +95,6 @@ { YQSignalBlocker sigBlocker( _qt_comboBox ); int index = _qt_comboBox->findText( text ); - YItem *item = findItem( newValue ); if ( index < 0 ) _qt_comboBox->setItemText(_qt_comboBox->currentIndex(), text ); else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.12/src/YQRichText.cc new/yast2-qt-2.16.12/src/YQRichText.cc --- old/yast2-qt-2.16.12/src/YQRichText.cc 2007-12-21 18:41:53.000000000 +0100 +++ new/yast2-qt-2.16.12/src/YQRichText.cc 2007-12-29 14:26:17.000000000 +0100 @@ -49,6 +49,7 @@ layout->addWidget( _textBrowser ); _textBrowser->installEventFilter( this ); + _textBrowser->setFrameShape( QFrame::NoFrame ); if ( plainTextMode ) { @@ -69,7 +70,7 @@ QPalette pal( _textBrowser->palette() ); pal.setColor( QPalette::Text, Qt::black ); - pal.setCurrentColorGroup( QPalette::Normal ); + pal.setColor( QPalette::Base, QColor(0,0,0,0)); _textBrowser->setPalette( pal ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-mail
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package yast2-mail checked in at Mon Dec 31 22:43:25 CET 2007. -------- --- yast2-mail/yast2-mail.changes 2007-09-25 10:26:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2007-12-30 19:59:48.540883000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 30 19:29:49 CET 2007 - pv(a)suse.de + +- #278535 - YaST2 mail dialog does not offer help on the "No connection" setting +- bugfix: it was not possible to connect to an existen LDAP-server during + the configuration +- bugfix: check if bind-utils is installed. We need the dnsZone.schema + file +- #337398 - Long time bug in yast mail transfer agent module regarding + relayhost port setting +- #335524 Advanced Mail Transfer Agent cannot access LDAP server +- fixing the return values of wizard elements +- 2.15.24 + +------------------------------------------------------------------- Old: ---- yast2-mail-2.15.23.tar.bz2 New: ---- yast2-mail-2.15.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.y28864/_old 2007-12-31 22:42:58.000000000 +0100 +++ /var/tmp/diff_new_pack.y28864/_new 2007-12-31 22:42:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-mail (Version 2.15.23) +# spec file for package yast2-mail (Version 2.15.24) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ # norootforbuild Name: yast2-mail -Version: 2.15.23 +Version: 2.15.24 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.15.23.tar.bz2 +Source0: yast2-mail-2.15.24.tar.bz2 Prefix: /usr -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users PreReq: %fillup_prereq # new firewall interface @@ -66,7 +66,7 @@ Peter Varkoly <varkoly(a)novell.com> %prep -%setup -n yast2-mail-2.15.23 +%setup -n yast2-mail-2.15.24 %build %{prefix}/bin/y2tool y2autoconf @@ -159,6 +159,17 @@ %dir /usr/share/YaST2/clients /usr/share/YaST2/clients/users* %changelog +* Sun Dec 30 2007 - pv(a)suse.de +- #278535 - YaST2 mail dialog does not offer help on the "No connection" setting +- bugfix: it was not possible to connect to an existen LDAP-server during + the configuration +- bugfix: check if bind-utils is installed. We need the dnsZone.schema + file +- #337398 - Long time bug in yast mail transfer agent module regarding + relayhost port setting +- #335524 Advanced Mail Transfer Agent cannot access LDAP server +- fixing the return values of wizard elements +- 2.15.24 * Mon Sep 24 2007 - pv(a)suse.de - #327550 - yast2-mail fetchmail error - 2.15.23 ++++++ yast2-mail-2.15.23.tar.bz2 -> yast2-mail-2.15.24.tar.bz2 ++++++ ++++ 8884 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-mail-2.15.23/agents/CyrusConfParser.pm new/yast2-mail-2.15.24/agents/CyrusConfParser.pm --- old/yast2-mail-2.15.23/agents/CyrusConfParser.pm 2007-05-24 11:58:17.000000000 +0200 +++ new/yast2-mail-2.15.24/agents/CyrusConfParser.pm 2007-11-22 10:44:05.000000000 +0100 @@ -1,3 +1,4 @@ +#!/usr/bin/perl # # $Id: CyrusConfParser.pm 23262 2005-05-03 11:30:49Z choeger $ # 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-mail-2.15.23/agents/MasterCFParser.pm new/yast2-mail-2.15.24/agents/MasterCFParser.pm --- old/yast2-mail-2.15.23/agents/MasterCFParser.pm 2007-05-24 11:58:17.000000000 +0200 +++ new/yast2-mail-2.15.24/agents/MasterCFParser.pm 2007-11-22 10:43:46.000000000 +0100 @@ -1,3 +1,4 @@ +#!/usr/bin/perl # # $Id: MasterCFParser.pm 30394 2006-04-24 10:12:22Z varkoly $ # 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-mail-2.15.23/agents/sysconfig.mail new/yast2-mail-2.15.24/agents/sysconfig.mail --- old/yast2-mail-2.15.23/agents/sysconfig.mail 2007-07-18 15:39:06.000000000 +0200 +++ new/yast2-mail-2.15.24/agents/sysconfig.mail 2007-10-30 16:10:53.000000000 +0100 @@ -46,4 +46,4 @@ # # This variable contains the type of the mail server configuration. # -CONF_TYPE="undef" +CONFIG_TYPE="undef" 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-mail-2.15.23/configure.in new/yast2-mail-2.15.24/configure.in --- old/yast2-mail-2.15.23/configure.in 2007-08-12 12:02:36.000000000 +0200 +++ new/yast2-mail-2.15.24/configure.in 2007-11-22 10:47:28.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-mail dnl -dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-mail, 2.15.9, http://bugs.opensuse.org/, yast2-mail) +AC_INIT(yast2-mail, 2.15.23, http://bugs.opensuse.org/, yast2-mail) 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.15.9" +VERSION="2.15.23" RPMNAME="yast2-mail" MAINTAINER="Peter Varkoly <varkoly(a)novell.com>" 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-mail-2.15.23/Makefile.am new/yast2-mail-2.15.24/Makefile.am --- old/yast2-mail-2.15.23/Makefile.am 2007-08-12 12:02:36.000000000 +0200 +++ new/yast2-mail-2.15.24/Makefile.am 2007-11-22 10:47:28.000000000 +0100 @@ -30,7 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal @@ -210,8 +210,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # Contents of ./SUBDIRS SUBDIRS = agents doc permissions src users-plugin 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-mail-2.15.23/missing new/yast2-mail-2.15.24/missing --- old/yast2-mail-2.15.23/missing 2007-08-12 12:02:40.000000000 +0200 +++ new/yast2-mail-2.15.24/missing 2007-11-22 10:47:34.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 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-mail-2.15.23/src/helps.ycp new/yast2-mail-2.15.24/src/helps.ycp --- old/yast2-mail-2.15.23/src/helps.ycp 2007-05-24 11:58:17.000000000 +0200 +++ new/yast2-mail-2.15.24/src/helps.ycp 2007-12-30 19:28:51.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: helps.ycp 15188 2004-03-02 13:48:13Z lslezak $ + * $Id: helps.ycp 43241 2007-12-30 18:28:50Z varkoly $ * * The help texts. * @@ -79,7 +79,9 @@ How are you connected to the Internet? With a dial-up connection, mails will not be sent immediately but rather after invoking sendmail -q. -"); +") + +_("Choosing No connection the mail server will be started +but only local mail transport is possible. The MTA listens on localhost."); return s; } 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-mail-2.15.23/src/mail-advanced.ycp new/yast2-mail-2.15.24/src/mail-advanced.ycp --- old/yast2-mail-2.15.23/src/mail-advanced.ycp 2007-09-11 14:41:03.000000000 +0200 +++ new/yast2-mail-2.15.24/src/mail-advanced.ycp 2007-10-24 13:29:57.000000000 +0200 @@ -36,13 +36,14 @@ * @param options map of options from command line * @return boolean true on success */ -boolean SetupMailServer(map<string,string> options) +boolean SetupMailServer() { any ret = SetupSequence(); return true; } -map cmdline_description = $[ +map cmdline_description = +$[ "id" : "mail-server", /* Command line help text for the mail-server module */ "help" : _("Configuration of mail server"), @@ -85,6 +86,10 @@ { ret = MailServerAutoSequence(); } +else if(setup) +{ + ret = SetupSequence(); +} else { ret = CommandLine::Run(cmdline_description); 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-mail-2.15.23/src/mail-server_complex.ycp new/yast2-mail-2.15.24/src/mail-server_complex.ycp --- old/yast2-mail-2.15.23/src/mail-server_complex.ycp 2007-09-11 14:43:14.000000000 +0200 +++ new/yast2-mail-2.15.24/src/mail-server_complex.ycp 2007-10-30 16:03:39.000000000 +0100 @@ -37,7 +37,7 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -boolean SetupDialog() { +symbol SetupDialog() { Wizard::RestoreHelp(HELPS["setup"]:""); string caption = _("Setup the Mail Server"); integer steps = 3; @@ -74,17 +74,17 @@ Progress::NextStage(); if( ! MailServer::CheckPackages() ) { - return false; + return `abort; } sleep(sl); // read packages Progress::NextStage(); if( CheckLDAPDialog() != `ok ) { - return false; + return `abort; } sleep(sl); - return true; + return `next; } /** 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-mail-2.15.23/src/mail-server_dialogs.ycp new/yast2-mail-2.15.24/src/mail-server_dialogs.ycp --- old/yast2-mail-2.15.23/src/mail-server_dialogs.ycp 2007-09-12 16:00:26.000000000 +0200 +++ new/yast2-mail-2.15.24/src/mail-server_dialogs.ycp 2007-12-12 12:49:28.000000000 +0100 @@ -32,6 +32,7 @@ */ define any CheckLDAPDialog () { + y2milestone("--Start CheckLDAPDialog ---"); boolean ca_mgm = false; boolean conf_ldap_server = false; boolean setup_ldap_server = false; @@ -40,10 +41,12 @@ Ldap::LDAPInit(); map<string, any> LDAPSettings = (map <string, any>) Ldap::Export(); list args = []; - if(LDAPSettings["ldap_domain"]:"" == "" ) + y2milestone(" LDAPSettings %1", LDAPSettings); + if( ! LDAPSettings["start_ldap"]:false ) { //No LDAP-Client configuration setup_ldap_server = true; ca_mgm = true; + conf_ldap_server = true; comment = _("Your computer is not configured as LDAP-client.") + " " + _("We suggest to setup a local LDAP-server for the mail server.") + " " + _("To secure your system we suggest to create certificates for the LDAP and Mail Server.") + " "; @@ -52,14 +55,14 @@ { //The computer is configured as LDAP-Client if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ) { // The LDAP-Server is local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + " " + + comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + " " + _("We suggest to adapt the LDAP-server configuration for the mail server.") + " " + _("For this reason you have to know the password of the LDAP-administrator account:") + " " + "" + LDAPSettings["bind_dn"]:"" + ". "; } else { // The LDAP-Server is not local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + " " + + comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + " " + _("We suggest to configure the LDAP-server for the mail server.") + " " + _("For this reason you have to know the password of the LDAP-administrator account:") + " " + "" + LDAPSettings["bind_dn"]:"" + ". " + @@ -100,20 +103,43 @@ { // Now we setup the ca managemant args = add(args, "ca_mgm"); } + Progress::NextStage(); if( setup_ldap_server ) { // Now we setup the LDAP Server args = add(args, "setup"); + } + if( setup_ldap_server || ca_mgm || conf_ldap_server ) + { WFM::CallFunction("mail-server_ldap-setup",args); Ldap::Read(); Ldap::LDAPInit(); - LDAPSettings = (map <string, any>) Ldap::Export(); } - string adminpw = Ldap::LDAPAskAndBind(false); - if( adminpw != nil ) + Progress::NextStage(); + MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); + if( MailServer::AdminPassword != nil ) { - YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings); + block<boolean> abort = ``{ + if (UI::PollInput () == `abort && + // popup text + Popup::YesNo (_("Really abort the writing process?"))) + return true; + return false; + }; + + //tell Ldap module to create the default objects: + LDAPSettings [ "create_ldap" ] = true; + Ldap::Import(LDAPSettings); +y2milestone("after LDAPSettings %1", LDAPSettings); + //write the settings: + Ldap::Write(abort); + //create default mail-server configuration + YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,LDAPSettings); + return `ok; + } + else + { + return `abort; } - return `ok; } /** @@ -124,6 +150,7 @@ define any AuthorizingDialog () { + y2milestone("--Start AuthorizingDialog ---"); Ldap::Read(); map LDAPSettings = Ldap::Export(); if(LDAPSettings["bind_dn"]:"" == "" ) @@ -140,6 +167,7 @@ } Ldap::Read(); } + Ldap::LDAPInit(); integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem"); integer size2 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/serverkey.pem"); @@ -152,11 +180,16 @@ MailServer::CertExist = true; } - return Ldap::LDAPAskAndBind(false); - + MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); + if( MailServer::AdminPassword == nil ) + { + return `abort; + } + return `next; } -list<map> GenerateTree(list<map> Tree, string parent, list<list> input) { +list<map> GenerateTree(list<map> Tree, string parent, list<list> input) +{ foreach(list i, input, ``{ string title = i[0]:""; @@ -170,7 +203,9 @@ return Tree; } -term GlobalSettingsDialog() { +term GlobalSettingsDialog() +{ + y2milestone("--Start GlobalSettingsDialog ---"); boolean limit = ((string)MailServer::GlobalSettings["MaximumMailSize"]:"0" != "0"); boolean is_DNS = ((string)MailServer::GlobalSettings["SendingMail","Type"]:"" == "DNS"); boolean is_NONE = ((string)MailServer::GlobalSettings["SendingMail","Type"]:"" == "NONE"); @@ -302,7 +337,8 @@ return content; } -list<term> MakeSelectedList(list<string> items, string value ) { +list<term> MakeSelectedList(list<string> items, string value ) +{ list<term> SelectedList = []; foreach(string i, items, ``{ if( i == value ) { @@ -314,7 +350,9 @@ return SelectedList; } -void ShowMailTransport(string CID, string ACTION) { +void ShowMailTransport(string CID, string ACTION) +{ + y2milestone("--Start ShowMailTransport ---"); list<map<string,string> > Transports = (list<map<string,string> >) MailServer::MailTransports["Transports"]:[]; map<string,string> TLSSites = (map<string,string>) MailServer::MailTransports["TLSSites"]:$[]; map<string,list> SASLAccounts = (map<string,list>) MailServer::MailTransports["SASLAccounts"]:$[]; @@ -549,7 +587,9 @@ return; } -term MailTransportsDialog() { +term MailTransportsDialog() +{ + y2milestone("--Start MailTransportsDialog ---"); list<map<string,string> > Transports = (list<map<string,string> >) MailServer::MailTransports["Transports"]:[]; map<string,string> TLSSites = (map<string,string>) MailServer::MailTransports["TLSSites"]:$[]; list Transport_items = []; @@ -595,7 +635,9 @@ return content; } -term MailPreventionDialog(string CID, string CIDRBL) { +term MailPreventionDialog(string CID, string CIDRBL) +{ + y2milestone("--Start MailTransportsDialog ---"); list<term> AccessItems= []; list<term> RBLItems = []; string BasicProtection = (string)MailServer::MailPrevention["BasicProtection"]:""; @@ -627,6 +669,8 @@ }); term content = `VBox ( + `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `VSpacing (1), `Frame(_("SPAM Prevention"), `HBox( `HWeight(7, @@ -672,13 +716,13 @@ ) ) ) - ), - `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)) + ) ); return content; } -string RBLAdd () { +string RBLAdd () +{ UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New RBL Server"), `VBox( `TextEntry(`id(`server), "", ""), @@ -703,7 +747,8 @@ return server; } -map AccessAdd () { +map AccessAdd () +{ UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New Sender Restriction"), `VBox( `TextEntry(`id(`NewSender), _("Sender Address"), ""), @@ -737,7 +782,9 @@ return SenderRestriction; } -term MailRelayingDialog() { +term MailRelayingDialog() +{ + y2milestone("--Start MailRelayingDialog ---"); // boolean UserRestriction = ((string)MailServer::MailRelaying["UserRestriction"]:"0" == "1"); boolean RequireSASL = ((string)MailServer::MailRelaying["RequireSASL"]:"0" == "1"); boolean SMTPDTLSnone = ((string)MailServer::MailRelaying["SMTPDTLSMode"]:"none" == "none"); @@ -795,7 +842,9 @@ return content; } -term MailLocalDeliveryDialog() { +term MailLocalDeliveryDialog() +{ + y2milestone("--Start MailLocalDeliveryDialog ---"); boolean TypeCYRUS = ((string)MailServer::MailLocalDelivery["Type"]:"" == "cyrus"); boolean TypePROCMAIL = ((string)MailServer::MailLocalDelivery["Type"]:"" == "procmail"); boolean TypeLOCAL = ((string)MailServer::MailLocalDelivery["Type"]:"" == "local"); @@ -933,7 +982,9 @@ return content; } -term FetchingMailDialog() { +term FetchingMailDialog() +{ + y2milestone("--Start FetchingMailDialog ---"); list<term> table_items = []; integer IID = 0; list<map<string,string> > entries = (list<map<string,string> >) MailServer::FetchingMail["Items"]:[]; @@ -1017,7 +1068,9 @@ return content; } -map FetchmailAddItem(){ +map FetchmailAddItem() +{ + y2milestone("--Start FetchmailAddItem ---"); UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New Fetchmail Job"), `VBox( `TextEntry(`id(`server), _("Server Address"), ""), @@ -1070,7 +1123,9 @@ } -term MailLocalDomainsDialog(string CID) { +term MailLocalDomainsDialog(string CID) +{ + y2milestone("--Start MailLocalDomainsDialog ---"); list<term> Domains = []; boolean NoLocalDelivery = ((string)MailServer::MailLocalDelivery["Type"]:"" == "none"); if(NoLocalDelivery) { @@ -1122,8 +1177,9 @@ return content; } -void ShowMailLocalDomain(string CID, string ACTION) { - +void ShowMailLocalDomain(string CID, string ACTION) +{ + y2milestone("--Start ShowMailLocalDomain ---"); string Name = ""; string Type = "local"; boolean Masquerading = true; @@ -1198,6 +1254,7 @@ boolean CheckMainDomain() { + y2milestone("--Start CheckMainDomain ---"); integer maindomain = 0; integer domains = 0; @@ -1226,7 +1283,7 @@ any ComplexDialog() { - + y2milestone("--Start ComplexDialog ---"); Wizard::CreateTreeDialog(); list<map> Tree = GenerateTree([], "", MailServer::ModulesTreeContent) ; Wizard::CreateTree(Tree, _("Mail Server Configuration")); 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-mail-2.15.23/src/MailServerLDAP.pm new/yast2-mail-2.15.24/src/MailServerLDAP.pm --- old/yast2-mail-2.15.23/src/MailServerLDAP.pm 2007-08-12 14:56:27.000000000 +0200 +++ new/yast2-mail-2.15.24/src/MailServerLDAP.pm 2007-12-13 13:17:30.000000000 +0100 @@ -34,7 +34,7 @@ YaST::YCP::Import ("YaPI::LdapServer"); YaST::YCP::Import ("Service"); -BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", "any", [ "map","string","any"]];} +BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", "any"];} sub ConfigureLDAPServer() { # don't configure if using eDirectory server @@ -87,7 +87,7 @@ "param" => "eq" } ); } - if(!$SuSEMailClient) + if(!$suseTLSPerSitePeer) { YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", 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-mail-2.15.23/src/mail-server_ldap-setup.ycp new/yast2-mail-2.15.24/src/mail-server_ldap-setup.ycp --- old/yast2-mail-2.15.23/src/mail-server_ldap-setup.ycp 2007-09-12 16:09:15.000000000 +0200 +++ new/yast2-mail-2.15.24/src/mail-server_ldap-setup.ycp 2007-12-12 12:45:28.000000000 +0100 @@ -33,11 +33,16 @@ y2milestone("--- mail-server-ldap-setup ---"); // First we check if all requested modules are installed - if( !Package::Installed ( "ldap-server" ) ) + if( contains(args,"setup") && !Package::Installed ( "yast2-ldap-server" ) ) { l_to_install = add( l_to_install, "yast2-ldap-server" ); to_install = to_install + "yast2-ldap-server\n"; } + if( contains(args,"setup") && !Package::Installed ( "bind-utils" ) ) + { + l_to_install = add( l_to_install, "bind-utils" ); + to_install = to_install + "bind-utils\n"; + } if(contains(args,"ca_mgm") ) { if( !Package::Installed ( "yast2-ca-management" ) ) @@ -70,23 +75,11 @@ if(contains(args,"setup") ) { WFM::CallFunction("ldap-server",[]); + MailServerLDAP::ConfigureLDAPServer(); } if(contains(args,"setup") ) { WFM::CallFunction("ldap",[]); } - Ldap::Read(); - Ldap::LDAPInit(); - map<string, any> LDAPSettings = (map<string, any>)Ldap::Export(); - string adminpw = Ldap::LDAPAskAndBind(false); - MailServerLDAP::ConfigureLDAPServer(LDAPSettings); - if( adminpw != nil ) - { - YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings); - } - else - { - return false; - } return true; } 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-mail-2.15.23/src/mail-server_wizards.ycp new/yast2-mail-2.15.24/src/mail-server_wizards.ycp --- old/yast2-mail-2.15.23/src/mail-server_wizards.ycp 2007-07-18 15:40:28.000000000 +0200 +++ new/yast2-mail-2.15.24/src/mail-server_wizards.ycp 2007-10-30 15:54:06.000000000 +0100 @@ -109,6 +109,10 @@ `abort : `abort, `next : "main" ], + "main" : $[ + `abort : `abort, + `next : `next + ] ]; Wizard::CreateDialog(); 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-mail-2.15.23/src/MailServer.ycp new/yast2-mail-2.15.24/src/MailServer.ycp --- old/yast2-mail-2.15.23/src/MailServer.ycp 2007-09-11 14:36:19.000000000 +0200 +++ new/yast2-mail-2.15.24/src/MailServer.ycp 2007-11-27 15:08:16.000000000 +0100 @@ -159,6 +159,8 @@ return Package::Installed (package); } +global boolean pam_ldap_installed = false; +global boolean nss_ldap_installed = false; global boolean procmail_installed = false; global boolean amavis_installed = false; global boolean ldap_installed = false; @@ -216,7 +218,7 @@ if(! is_main_domain ) { y2milestone("no main mail domain"); - LDAPSettings["bind_pw"] = MailServer::AdminPassword; + LDAPSettings["bind_pw"] = AdminPassword; SCR::Execute (.ldap.bind,LDAPSettings); integer counter = 0; map lastDomain = $[]; @@ -258,6 +260,8 @@ */ global boolean CheckPackages() { + pam_ldap_installed = Installed("pam_ldap"); + nss_ldap_installed = Installed("nss_ldap"); procmail_installed = Installed("procmail"); cyrus_installed = Installed("cyrus-imapd"); postfix_installed = Installed("postfix"); @@ -269,16 +273,26 @@ string to_install = ""; list<string> l_to_install = []; - if (!ldap_installed) + if (!pam_ldap_installed) { - l_to_install = add( l_to_install, "yast2-ldap-client" ); - to_install = to_install + "yast2-ldap-client\n"; + l_to_install = add( l_to_install, "pam_ldap" ); + to_install = to_install + "pam_ldap\n"; + } + if (!nss_ldap_installed) + { + l_to_install = add( l_to_install, "nss_ldap" ); + to_install = to_install + "nss_ldap\n"; } if (!postfix_installed) { l_to_install = add( l_to_install, "postfix" ); to_install = to_install + "postfix\n"; } + if (!ldap_installed) + { + l_to_install = add( l_to_install, "yast2-ldap-client" ); + to_install = to_install + "yast2-ldap-client\n"; + } if(!sasl_installed) { l_to_install = add( l_to_install, "cyrus-sasl-plain" ); @@ -546,8 +560,9 @@ `focus_yes)) { Package::DoInstall(["clamav","amavisd-new"]); - Service::Start("amavis"); Service::Start("clamd"); + Service::Start("freshclam"); + Service::Start("amavis"); y2milestone("Installing amavis"); } else @@ -557,6 +572,7 @@ } Service::Enable("amavis"); Service::Enable("clamd"); + Service::Enable("freshclam"); } if( (boolean)MailPrevention["Changed"]:false ) { if( ! YaPI::MailServer::WriteMailPrevention(MailPrevention,AdminPassword) ) { @@ -564,6 +580,7 @@ } if((boolean)MailPrevention["VirusScanning"]:false) { Service::Restart("clamd"); + Service::Restart("freshclam"); Service::Restart("amavis"); } } 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-mail-2.15.23/src/mail.ycp new/yast2-mail-2.15.24/src/mail.ycp --- old/yast2-mail-2.15.23/src/mail.ycp 2007-09-12 15:25:57.000000000 +0200 +++ new/yast2-mail-2.15.24/src/mail.ycp 2007-10-31 12:31:51.000000000 +0100 @@ -12,7 +12,7 @@ * Martin Vidner <mvidner(a)suse.cz> * Peter Varkoly <varkoly(a)novell.com> * - * $Id: mail.ycp 40877 2007-09-12 13:21:52Z varkoly $ + * $Id: mail.ycp 41667 2007-10-31 11:29:56Z varkoly $ * * Main file for mail configuration. Uses all other files. * @@ -139,7 +139,6 @@ Popup::Error(_("You have to select a configuration type")); continue; } - SCR::Write (.sysconfig.mail.CONFIG_TYPE, sret); y2milestone ("Mail configuration type %1", sret); break; } @@ -205,7 +204,12 @@ { ret = WFM::CallFunction("mail-standard",args); } + y2milestone ("Mail module %1 returned %2", conf_type, ret); + if( ret != nil && ret != `cancel && ret != `abort ) + { + SCR::Write (.sysconfig.mail.CONFIG_TYPE, conf_type); + } } define boolean Setup (map<string, string> options) ``{ 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-mail-2.15.23/src/widgets.ycp new/yast2-mail-2.15.24/src/widgets.ycp --- old/yast2-mail-2.15.23/src/widgets.ycp 2007-05-24 11:58:17.000000000 +0200 +++ new/yast2-mail-2.15.24/src/widgets.ycp 2007-11-07 15:24:09.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: widgets.ycp 34093 2006-11-06 14:27:26Z mvidner $ + * $Id: widgets.ycp 41854 2007-11-07 14:21:37Z varkoly $ */ { @@ -221,8 +221,16 @@ // when validating: may be enclosed in brackets (prevents mx lookups) string oms = (string) UI::QueryWidget (`id (id), `Value); // watch this: "[", no brackets, "]" - string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? - regexpsub (oms, ".(.*).", "\\1") : oms; + string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".(.*).:.*", "\\1") : oms; + + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? regexpsub (oms, ".(.*).", "\\1") : oms; + } + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, ".*:.*") ? regexpsub (oms, "(.*):.*", "\\1") : oms; + } if (oms_no_brackets != "" && ! Address::Check (oms_no_brackets) 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-mail-2.15.23/src/YaPI/MailServer.pm new/yast2-mail-2.15.24/src/YaPI/MailServer.pm --- old/yast2-mail-2.15.23/src/YaPI/MailServer.pm 2007-08-12 14:23:42.000000000 +0200 +++ new/yast2-mail-2.15.24/src/YaPI/MailServer.pm 2007-11-27 15:17:10.000000000 +0100 @@ -2669,6 +2669,8 @@ write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps.cf, ldap:/etc/postfix/ldapalias_maps_member.cf'); + check_ldap_configuration('transport_maps',$ldapMap); + check_ldap_configuration('smtp_tls_per_site',$ldapMap); check_ldap_configuration('masquerade_domains',$ldapMap); check_ldap_configuration('mydestination',$ldapMap); check_ldap_configuration('local_recipient_maps',$ldapMap); 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-mail-2.15.23/VERSION new/yast2-mail-2.15.24/VERSION --- old/yast2-mail-2.15.23/VERSION 2007-09-24 16:55:33.000000000 +0200 +++ new/yast2-mail-2.15.24/VERSION 2007-11-27 11:54:49.000000000 +0100 @@ -1 +1 @@ -2.15.23 +2.15.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit yast2-autofs
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package yast2-autofs checked in at Mon Dec 31 22:42:50 CET 2007. -------- --- yast2-autofs/yast2-autofs.changes 2007-05-11 17:06:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-autofs/yast2-autofs.changes 2007-12-30 21:43:56.896352000 +0100 @@ -1,0 +2,7 @@ +Sun Dec 30 21:05:18 CET 2007 - pv(a)suse.de + +-#336276 - Attempt to configure autofs via YaST2 results in a Perl error message +-fixing some typos +- 2.15.3 + +------------------------------------------------------------------- Old: ---- yast2-autofs-2.15.2.tar.bz2 New: ---- yast2-autofs-2.15.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-autofs.spec ++++++ --- /var/tmp/diff_new_pack.N26093/_old 2007-12-31 22:41:31.000000000 +0100 +++ /var/tmp/diff_new_pack.N26093/_new 2007-12-31 22:41:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-autofs (Version 2.15.2) +# spec file for package yast2-autofs (Version 2.15.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,28 +11,28 @@ # norootforbuild Name: yast2-autofs -Version: 2.15.2 +Version: 2.15.3 Release: 1 -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-autofs-2.15.2.tar.bz2 -prefix: /usr +Source0: yast2-autofs-2.15.3.tar.bz2 +Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -BuildArchitectures: noarch -Summary: yast2 modul to create and manage autofs entries in LDAP +BuildArch: noarch +Summary: YaST2 - Module to Create and Manage autofs Entries in LDAP %description -This makes possible to create and manage autofs entries in an -LDAP-server. The autofs entries will be created according the -nis.schema using the objectclasses nisMap and nisObject. The entries -are placed under ou=AUTOFS,$LDAPBASE. +This makes possible to create and manage autofs entries in an LDAP +server. The autofs entries will be created according the nis.schema +using the objectclasses nisMap and nisObject. The entries are placed +under ou=AUTOFS,$LDAPBASE. %prep -%setup -n yast2-autofs-2.15.2 +%setup -n yast2-autofs-2.15.3 %build %{prefix}/bin/y2tool y2autoconf @@ -64,8 +64,11 @@ /usr/share/YaST2/modules/Autofs* %{prefix}/share/applications/YaST2/autofs.desktop %doc %{prefix}/share/doc/packages/yast2-autofs - %changelog +* Sun Dec 30 2007 - pv(a)suse.de +-#336276 - Attempt to configure autofs via YaST2 results in a Perl error message +-fixing some typos +- 2.15.3 * Fri May 11 2007 - varkoly(a)suse.de - #273198 - yast2 - autofs - typo * Tue Jan 23 2007 - varkoly(a)suse.de ++++++ yast2-autofs-2.15.2.tar.bz2 -> yast2-autofs-2.15.3.tar.bz2 ++++++ ++++ 7591 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-autofs-2.15.2/autodocs-ycp.ami new/yast2-autofs-2.15.3/autodocs-ycp.ami --- old/yast2-autofs-2.15.2/autodocs-ycp.ami 2007-05-11 17:05:17.000000000 +0200 +++ new/yast2-autofs-2.15.3/autodocs-ycp.ami 2007-12-30 21:37:45.000000000 +0100 @@ -1,18 +1,27 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $ +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc # PARAMETERS: # AUTODOCS_YCP: Files that the ycp autodocs is built from # Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm htmldir = $(docdir)/autodocs html_DATA = index.html $(wildcard *.html) -CLEANFILES = $(html_DATA) +CLEANFILES = $(html_DATA) pod2htm*.tmp -AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp -index.html: $(AUTODOCS_YCP) - ${YCPDOC} -d. $^ +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. $^ + for i in $(AUTODOCS_PM); do \ + b=`basename $$i`; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + done 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-autofs-2.15.2/configure.in new/yast2-autofs-2.15.3/configure.in --- old/yast2-autofs-2.15.2/configure.in 2007-05-11 17:05:17.000000000 +0200 +++ new/yast2-autofs-2.15.3/configure.in 2007-12-30 21:37:45.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-autofs dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-autofs, 2.15.2, http://bugs.opensuse.org/, yast2-autofs) +AC_INIT(yast2-autofs, 2.15.3, http://bugs.opensuse.org/, yast2-autofs) 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.15.2" +VERSION="2.15.3" RPMNAME="yast2-autofs" MAINTAINER="Peter Varkoly <varkoly(a)novell.com>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/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-autofs-2.15.2/Makefile.am new/yast2-autofs-2.15.3/Makefile.am --- old/yast2-autofs-2.15.2/Makefile.am 2007-05-11 17:05:17.000000000 +0200 +++ new/yast2-autofs-2.15.3/Makefile.am 2007-12-30 21:37:45.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -31,10 +30,10 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -211,8 +210,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am SUBDIRS = agents doc src 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-autofs-2.15.2/Makefile.am.common new/yast2-autofs-2.15.3/Makefile.am.common --- old/yast2-autofs-2.15.2/Makefile.am.common 2007-05-11 17:05:17.000000000 +0200 +++ new/yast2-autofs-2.15.3/Makefile.am.common 2007-12-30 21:37:45.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-autofs-2.15.2/missing new/yast2-autofs-2.15.3/missing --- old/yast2-autofs-2.15.2/missing 2007-05-11 17:05:21.000000000 +0200 +++ new/yast2-autofs-2.15.3/missing 2007-12-30 21:37:51.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 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-autofs-2.15.2/src/Autofs.pm new/yast2-autofs-2.15.3/src/Autofs.pm --- old/yast2-autofs-2.15.2/src/Autofs.pm 2007-01-23 11:19:34.000000000 +0100 +++ new/yast2-autofs-2.15.3/src/Autofs.pm 2007-12-30 21:03:23.000000000 +0100 @@ -566,7 +566,7 @@ # TODO FIXME Names of real stages # We do not set help text here, because it was set outside - Progress::New( $caption, " ", $steps, [ + Progress->New( $caption, " ", $steps, [ # Progress stage 1/2 __("Check the ldap configuration"), # Progress stage 2/2 @@ -583,7 +583,7 @@ ); # read database - Progress::NextStage(); + Progress->NextStage(); # Error message if(! $self->CheckLDAP()) { @@ -600,7 +600,7 @@ return Popup->Error($ERROR); } # read database - Progress::NextStage(); + Progress->NextStage(); # Error message if(! $self->ReadMaps()) { @@ -619,7 +619,7 @@ sleep($sl); # Progress finished - Progress::NextStage(); + Progress->NextStage(); sleep($sl); $modified = 0; @@ -645,7 +645,7 @@ # TODO FIXME Names of real stages # We do not set help text here, because it was set outside - Progress::New($caption, " ", $steps, [ + Progress->New($caption, " ", $steps, [ # Progress stage 1/1 __("Write the autofs maps") ], [ @@ -658,7 +658,7 @@ ); # write settings - Progress::NextStage(); + Progress->NextStage(); # Error message if(! $self->WriteAutofsMapsToLDAP()) { @@ -667,7 +667,7 @@ sleep($sl); # Progress finished - Progress::NextStage(); + Progress->NextStage(); sleep($sl); return Boolean(1); 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-autofs-2.15.2/src/helps.ycp new/yast2-autofs-2.15.3/src/helps.ycp --- old/yast2-autofs-2.15.2/src/helps.ycp 2007-05-11 16:52:27.000000000 +0200 +++ new/yast2-autofs-2.15.3/src/helps.ycp 2007-12-30 21:09:34.000000000 +0100 @@ -88,14 +88,14 @@ /* EntryDialog for NFS entry */ "EntryDialogNFS" : _("<big>NFS Entry</big> In case of NFS entry the Server is the DNS-name or IP-address of the NFS-server. -The Path ist the absolute pfad of the directory on the NFS-server. +The Path is the absolute path of the directory on the NFS-server. The Options must be valid options of the mount(8) command for NFS file system. "), /* EntryDialog for SAMBA entry */ "EntryDialogSAMBA" : _("<big>SAMBA Entry</big> In case of SAMBA entry the Server is the DNS-name or IP-address of the SAMBA-server. -The Share ist the name of the share to be mounted. +The Share is the name of the share to be mounted. The Options must be valid options of the mount(8) command for SMB/CIFS file system "), 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-autofs-2.15.2/VERSION new/yast2-autofs-2.15.3/VERSION --- old/yast2-autofs-2.15.2/VERSION 2007-05-11 16:56:14.000000000 +0200 +++ new/yast2-autofs-2.15.3/VERSION 2007-12-30 21:35:20.000000000 +0100 @@ -1 +1 @@ -2.15.2 +2.15.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xfce4-panel-plugins
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package xfce4-panel-plugins checked in at Mon Dec 31 22:41:24 CET 2007. -------- --- xfce4-panel-plugins/xfce4-panel-plugins.changes 2007-11-02 15:15:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugins/xfce4-panel-plugins.changes 2007-12-26 21:05:32.000000000 +0100 @@ -1,0 +2,56 @@ +Wed Dec 26 20:24:24 CET 2007 - bwalle(a)suse.de + +- update xfce4-timer-plugin to 0.6 + o Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456316 + o Use XfceTimer.rc file to permanently remember settings. + o Add a workaround for settings not saving correctly +- dropped xfce4-timer-plugin-0.5.1.patch, issue was fixed upstream +- update xfce4-notes-plugin to 1.6.1 + o add file system monitoring + o some bugfixes + +------------------------------------------------------------------- +Wed Dec 12 09:37:28 CET 2007 - bwalle(a)suse.de + +- update xfce4-sensors-plugin to 0.10.99.3 + o hddtemp support is working again with automatic path detection + o acpi stuff should basically work + o status values like alarms or the acpi fans are treated as on/off + now + o few memory leaks have been removed + o working with libsensors4 + +------------------------------------------------------------------- +Tue Dec 4 11:43:50 CET 2007 - prusnak(a)suse.cz + +- updated package version to 4.4.2 +- fixed build of xfce4-notes on 10.3+ + +------------------------------------------------------------------- +Tue Dec 4 09:41:20 CET 2007 - bwalle(a)suse.de + +- disable xfce4-notes-plugin for openSUSE < 10.2 + +------------------------------------------------------------------- +Sun Nov 25 12:26:56 CET 2007 - bwalle(a)suse.de + +- update to xfce4-notes-plugin 1.6.0 + o complete rewrite + o old notes will not work + o old configuration will not work either + +------------------------------------------------------------------- +Sun Nov 18 17:10:47 CET 2007 - bwalle(a)suse.de + +- update to xfce4-weather-plugin 0.6.1 + o Hide event box window. + o Improved icon handling. + o Fix 100% CPU usage when there is no connection. + o Plugin works on FreeBSD and some other minor issues. + +------------------------------------------------------------------- +Tue Nov 6 10:46:23 CET 2007 - prusnak(a)suse.cz + +- updated xfce4-sensors-plugin to 0.10.99.2 + +------------------------------------------------------------------- Old: ---- xfce4-notes-plugin-1.4.1.tar.bz2 xfce4-sensors-plugin-0.10.99.1.tar.bz2 xfce4-timer-plugin-0.5.1.patch xfce4-timer-plugin-0.5.1.tar.bz2 xfce4-weather-plugin-0.6.0.tar.bz2 New: ---- xfce4-notes-plugin-1.6.1.tar.bz2 xfce4-sensors-plugin-0.10.99.3.tar.bz2 xfce4-timer-plugin-0.6.tar.bz2 xfce4-weather-plugin-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugins.spec ++++++ --- /var/tmp/diff_new_pack.b24598/_old 2007-12-31 22:40:28.000000000 +0100 +++ /var/tmp/diff_new_pack.b24598/_new 2007-12-31 22:40:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xfce4-panel-plugins (Version 4.4.1) +# spec file for package xfce4-panel-plugins (Version 4.4.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ Name: xfce4-panel-plugins Url: http://goodies.xfce.org/projects/panel-plugins/start AutoReqProv: on -Version: 4.4.1 -Release: 5 +Version: 4.4.2 +Release: 1 License: GPL v2 or later Summary: Plugins for the Xfce panel Group: System/GUI/XFCE @@ -25,8 +25,14 @@ BuildRequires: exo-devel libxfcegui4-devel xfce4-panel-devel BuildRequires: gnome-panel-devel hal-devel thunar-devel BuildRequires: xfmedia-devel +# to execute autogen.sh +BuildRequires: intltool xfce4-dev-tools %ifnarch s390 s390x +%if 0%{?suse_version} > 1030 BuildRequires: libsensors3-devel +%else +BuildRequires: sensors +%endif %endif %if 0%{?suse_version} > 1010 BuildRequires: dbus-1-glib-devel @@ -52,20 +58,20 @@ %define mount_version 0.5.4 %define mpc_version 0.3.2 %define netload_version 0.4.0 -%define notes_version 1.4.1 +%define notes_version 1.6.1 %define places_version 1.0.0 %define quicklauncher_version 1.9.4 %define radio_version 0.2.0 %define screenshooter_version 1.0.0 -%define sensors_version 0.10.99.1 +%define sensors_version 0.10.99.3 %define smartbookmark_version 0.4.2 %define smartpm_version 0.1.2 %define systemload_version 0.4.2 %define timeout_version 0.1.1 -%define timer_version 0.5.1 +%define timer_version 0.6 %define verve_version 0.3.5 %define wavelan_version 0.5.4 -%define weather_version 0.6.0 +%define weather_version 0.6.1 %define xfapplet_version 0.1.0 %define xmms_version 0.5.1 %define xkb_version 0.4.3 @@ -76,16 +82,16 @@ %else %define plugins_arch sensors %endif -%define plugins_common battery clipman cpu-freq cpugraph datetime dict diskperf eyes fsguard genmon mailwatch mount mpc netload notes quicklauncher radio screenshooter smartbookmark smartpm systemload time-out timer verve wavelan weather xkb xmms xfmedia-remote %plugins_arch +%define plugins_common battery clipman cpu-freq cpugraph datetime dict diskperf eyes fsguard genmon mailwatch mount mpc netload quicklauncher radio screenshooter smartbookmark smartpm systemload time-out timer verve wavelan weather xkb xmms xfmedia-remote %plugins_arch %define plugins %plugins_common %if 0%{?suse_version} >= 1010 %define plugins %plugins_common cellmodem %endif %if 0%{?suse_version} >= 1020 -%define plugins %plugins_common cellmodem places xfapplet +%define plugins %plugins_common cellmodem places xfapplet notes %endif %if 0%{?suse_version} >= 1030 -%define plugins %plugins_common cellmodem places xfapplet governor cddrive +%define plugins %plugins_common cellmodem places xfapplet notes governor cddrive %endif Source99: rpmlintrc Source0: xfce4-battery-plugin-%{battery_version}.tar.bz2 @@ -125,9 +131,8 @@ Source32: xfce4-cddrive-plugin-%{cddrive_version}.tar.bz2 Source33: xfce4-governor-plugin-%{governor_version}.tar.bz2 Source34: xfce4-xfmedia-remote-plugin-%{xfmedia_remote_version}.tar.bz2 -Patch0: xfce4-timer-plugin-%{timer_version}.patch -Patch2: xfce4-cpufreq-plugin-%{cpufreq_version}.patch -Patch3: xfce4-xmms-plugin-%{xmms_version}.patch +Patch0: xfce4-cpufreq-plugin-%{cpufreq_version}.patch +Patch1: xfce4-xmms-plugin-%{xmms_version}.patch %description Xfmedia Remote Plugin is a plugin for Xfce 4 Panel which enables @@ -146,13 +151,16 @@ mv xfmedia-remote-plugin-%{xfmedia_remote_version} \ xfce4-xfmedia-remote-plugin-%{xfmedia_remote_version} %patch0 -%patch2 -%patch3 +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" for name in %{plugins} ; do cd xfce4-$name-plugin-* + # for xfce4-notes-plugin-1.6.1 + if [ ! -f configure ] ; then + ./autogen.sh + fi %configure make %{?jobs:-j%jobs} cd .. @@ -187,6 +195,7 @@ Tobias Henle <tobias(a)page23.de> %if 0%{?suse_version} >= 1030 + %package -n xfce4-panel-plugin-cddrive Version: %{cddrive_version} Release: 1 @@ -204,7 +213,9 @@ %endif +# ----- cellmodem ----- %if 0%{?suse_version} >= 1010 + %package -n xfce4-panel-plugin-cellmodem Version: %{cellmodem_version} Release: 1 @@ -223,6 +234,8 @@ Tobias Henle <tobias(a)page23.de> %endif +# ----- clipman ----- + %package -n xfce4-panel-plugin-clipman Version: %{clipman_version} Release: 1 @@ -444,6 +457,8 @@ Benedikt Meurer <Benedikt.Meurer(a)unix-ag.uni-siegen.de> Tobias Henle <tobias(a)page23.de> +%if 0%{?suse_version} >= 1020 + %package -n xfce4-panel-plugin-notes Version: %{notes_version} Release: 1 @@ -461,7 +476,10 @@ Benedikt Meurer <Benedikt.Meurer(a)unix-ag.uni-siegen.de> Tobias Henle <tobias(a)page23.de> +%endif +# ----- places ----- %if 0%{?suse_version} >= 1020 + %package -n xfce4-panel-plugin-places Version: %{places_version} Release: 1 @@ -480,6 +498,8 @@ Tobias Henle <tobias(a)page23.de> %endif +# ----- quicklauncher ----- + %package -n xfce4-panel-plugin-quicklauncher Version: %{quicklauncher_version} Release: 1 @@ -532,11 +552,13 @@ Tobias Henle <tobias(a)page23.de> %ifnarch s390 s390x + %package -n xfce4-panel-plugin-sensors Version: %{sensors_version} Release: 1 Summary: Plugins for the Xfce panel Group: System/GUI/XFCE +Requires: sensors %description -n xfce4-panel-plugin-sensors Collection of panel plugins for the XFce 4 desktop environment. @@ -550,6 +572,8 @@ Tobias Henle <tobias(a)page23.de> %endif +# ----- smartbookmark ----- + %package -n xfce4-panel-plugin-smartbookmark Version: %{smartbookmark_version} Release: 1 @@ -687,6 +711,7 @@ Tobias Henle <tobias(a)page23.de> %if 0%{?suse_version} >= 1020 + %package -n xfce4-panel-plugin-xfapplet Version: %{xfapplet_version} Release: 1 @@ -706,6 +731,8 @@ Tobias Henle <tobias(a)page23.de> %endif +# ----- xmms ----- + %package -n xfce4-panel-plugin-xmms Version: %{xmms_version} Release: 1 @@ -741,6 +768,7 @@ Tobias Henle <tobias(a)page23.de> %if 0%{?suse_version} >= 1030 + %package -n xfce4-panel-plugin-governor Version: %{governor_version} Release: 1 @@ -759,6 +787,8 @@ %endif +# ----- governor ----- + %package -n xfce4-panel-plugin-xfmedia-remote Version: %{xfmedia_remote_version} Release: 1 @@ -770,7 +800,6 @@ - %files -n xfce4-panel-plugin-battery %defattr(-,root,root) %{_libexecdir}/xfce4/panel-plugins/xfce4-battery-plugin @@ -880,6 +909,7 @@ %{_libexecdir}/xfce4/panel-plugins/xfce4-netload-plugin %{_datadir}/locale/*/LC_MESSAGES/xfce4-netload-plugin.mo %{_datadir}/xfce4/panel-plugins/netload.desktop +%if 0%{?suse_version} >= 1020 %files -n xfce4-panel-plugin-notes %defattr(-,root,root) @@ -888,6 +918,7 @@ %{_datadir}/icons/hicolor/*/apps/xfce4-notes-plugin.* %{_datadir}/locale/*/LC_MESSAGES/xfce4-notes-plugin.mo %{_datadir}/xfce4/panel-plugins/xfce4-notes-plugin.desktop +%endif %if 0%{?suse_version} >= 1020 %files -n xfce4-panel-plugin-places @@ -1020,7 +1051,43 @@ %{_libexecdir}/xfce4/panel-plugins/xfmedia-remote-plugin %{_datadir}/locale/*/LC_MESSAGES/xfmedia-remote-plugin.mo %{_datadir}/xfce4/panel-plugins/xfmedia-remote.desktop + %changelog +* Wed Dec 26 2007 - bwalle(a)suse.de +- update xfce4-timer-plugin to 0.6 + o Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456316 + o Use XfceTimer.rc file to permanently remember settings. + o Add a workaround for settings not saving correctly +- dropped xfce4-timer-plugin-0.5.1.patch, issue was fixed upstream +- update xfce4-notes-plugin to 1.6.1 + o add file system monitoring + o some bugfixes +* Wed Dec 12 2007 - bwalle(a)suse.de +- update xfce4-sensors-plugin to 0.10.99.3 + o hddtemp support is working again with automatic path detection + o acpi stuff should basically work + o status values like alarms or the acpi fans are treated as on/off + now + o few memory leaks have been removed + o working with libsensors4 +* Tue Dec 04 2007 - prusnak(a)suse.cz +- updated package version to 4.4.2 +- fixed build of xfce4-notes on 10.3+ +* Tue Dec 04 2007 - bwalle(a)suse.de +- disable xfce4-notes-plugin for openSUSE < 10.2 +* Sun Nov 25 2007 - bwalle(a)suse.de +- update to xfce4-notes-plugin 1.6.0 + o complete rewrite + o old notes will not work + o old configuration will not work either +* Sun Nov 18 2007 - bwalle(a)suse.de +- update to xfce4-weather-plugin 0.6.1 + o Hide event box window. + o Improved icon handling. + o Fix 100%% CPU usage when there is no connection. + o Plugin works on FreeBSD and some other minor issues. +* Tue Nov 06 2007 - prusnak(a)suse.cz +- updated xfce4-sensors-plugin to 0.10.99.2 * Fri Nov 02 2007 - jdelvare(a)suse.de - libsensors is in a separate package now. * Fri Oct 26 2007 - bwalle(a)suse.de ++++++ xfce4-notes-plugin-1.4.1.tar.bz2 -> xfce4-notes-plugin-1.6.1.tar.bz2 ++++++ ++++ 33110 lines of diff (skipped) ++++++ xfce4-sensors-plugin-0.10.99.1.tar.bz2 -> xfce4-sensors-plugin-0.10.99.3.tar.bz2 ++++++ ++++ 11811 lines of diff (skipped) ++++++ xfce4-timer-plugin-0.5.1.tar.bz2 -> xfce4-timer-plugin-0.6.tar.bz2 ++++++ ++++ 10476 lines of diff (skipped) ++++++ xfce4-weather-plugin-0.6.0.tar.bz2 -> xfce4-weather-plugin-0.6.1.tar.bz2 ++++++ ++++ 27844 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit unshield
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package unshield checked in at Mon Dec 31 22:39:38 CET 2007. -------- --- unshield/unshield.changes 2007-03-12 18:54:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/unshield/unshield.changes 2007-12-27 01:13:02.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Dec 27 01:12:05 CET 2007 - crrodriguez(a)suse.de + +- fix library-without-ldconfig-post* errors +- remove static libraries and "la" files +- fix -devel package dependencies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unshield.spec ++++++ --- /var/tmp/diff_new_pack.o18824/_old 2007-12-31 22:39:27.000000000 +0100 +++ /var/tmp/diff_new_pack.o18824/_new 2007-12-31 22:39:27.000000000 +0100 @@ -12,11 +12,11 @@ Name: unshield BuildRequires: zlib-devel -Summary: A program to extract InstallShield cabinet files +Summary: A Program to Extract InstallShield Cabinet Files Version: 0.5 -Release: 1 -License: MIT -URL: http://synce.sourceforge.net/ +Release: 46 +License: X11/MIT +Url: http://synce.sourceforge.net/ Group: Productivity/Archiving/Compression Source: %{name}-%{version}.tar.bz2 Patch0: unshield-zlib_test.patch @@ -38,8 +38,7 @@ %package devel Summary: A program to extract InstallShield cabinet files Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} -Requires: zlib-devel +Requires: %{name} = %{version} glibc-devel %description devel Cabinet (.CAB) files are a form of archive, which is used by the @@ -61,7 +60,7 @@ %build autoreconf -f -i export CFLAGS="%optflags" -%configure +%configure --disable-static --with-pic make %{?jobs:-j%jobs} %install @@ -70,6 +69,10 @@ %clean rm -rf %{buildroot} +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README LICENSE @@ -80,10 +83,13 @@ %defattr(-,root,root) %{_includedir}/libunshield.h %{_libdir}/libunshield.so -%{_libdir}/libunshield.a -%{_libdir}/libunshield.la %{_datadir}/aclocal/* +%exclude %{_libdir}/libunshield.la %changelog +* Thu Dec 27 2007 - crrodriguez(a)suse.de +- fix library-without-ldconfig-post* errors +- remove static libraries and "la" files +- fix -devel package dependencies * Mon Mar 12 2007 - pth(a)suse.de - Initial package creation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit SDL_Pango
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package SDL_Pango checked in at Mon Dec 31 22:39:20 CET 2007. -------- --- SDL_Pango/SDL_Pango.changes 2006-10-29 19:16:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/SDL_Pango/SDL_Pango.changes 2007-12-27 04:14:16.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 27 04:13:56 CET 2007 - crrodriguez(a)suse.de + +- fix library-without-ldconfig-* errors + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_Pango.spec ++++++ --- /var/tmp/diff_new_pack.b18351/_old 2007-12-31 22:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.b18351/_new 2007-12-31 22:39:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package SDL_Pango (Version 0.1.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -12,12 +12,12 @@ Name: SDL_Pango BuildRequires: SDL-devel fontconfig-devel freetype2-devel pango-devel pkgconfig -URL: http://sdlpango.sourceforge.net/ -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Url: http://sdlpango.sourceforge.net/ +License: LGPL v2.1 or later Group: System/Libraries -Autoreqprov: on +AutoReqProv: on Version: 0.1.2 -Release: 1 +Release: 108 Summary: Programming Pango via SDL Source: %{name}-%{version}.tar.gz Patch: %{name}-0.1.2-API-adds.patch @@ -36,8 +36,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development. Group: System/Libraries -Requires: SDL_Pango -Autoreqprov: on +Requires: %{name} = %{version} %description devel This package contains all necessary include files and libraries needed @@ -50,7 +49,7 @@ NAKAMURA Ken'ichi %prep -%setup +%setup -q %patch %build @@ -58,12 +57,15 @@ make 2>&1 | grep -v 767 %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc AUTHORS COPYING README @@ -78,6 +80,8 @@ /usr/%{_lib}/libSDL_Pango.la /usr/%{_lib}/libSDL_Pango.so -%changelog -n SDL_Pango +%changelog +* Thu Dec 27 2007 - crrodriguez(a)suse.de +- fix library-without-ldconfig-* errors * Sun Oct 29 2006 - sndirsch(a)suse.de - created package ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit scim-input-pad
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package scim-input-pad checked in at Mon Dec 31 22:39:10 CET 2007. -------- --- scim-input-pad/scim-input-pad.changes 2006-10-29 00:02:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/scim-input-pad/scim-input-pad.changes 2007-12-27 02:30:43.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 27 02:30:15 CET 2007 - crrodriguez(a)suse.de + +- fix library-without-ldconfig-* errors + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-input-pad.spec ++++++ --- /var/tmp/diff_new_pack.E17721/_old 2007-12-31 22:38:36.000000000 +0100 +++ /var/tmp/diff_new_pack.E17721/_new 2007-12-31 22:38:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scim-input-pad (Version 0.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -13,12 +13,12 @@ Name: scim-input-pad BuildRequires: gcc-c++ gtk2-devel scim-devel update-desktop-files Version: 0.1.1 -Release: 32 -License: GNU General Public License (GPL) - all versions +Release: 163 +License: GPL v2 or later Group: System/X11/Utilities -Autoreqprov: on +AutoReqProv: on Provides: locale(scim:ja;ko;zh) -URL: http://www.scim-im.org +Url: http://www.scim-im.org # CVS repository: # cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim login # cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim co scim-input-pad @@ -40,12 +40,9 @@ %setup -q -n %{name}-%{version} %build -libtoolize --force autoreconf -I /opt/gnome/share/aclocal --force --install --verbose CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ +%configure --with-pic --disable-static \ --enable-debug make @@ -55,7 +52,11 @@ %find_lang scim-input-pad %clean -#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT; + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files -f scim-input-pad.lang %defattr(-, root, root) @@ -69,7 +70,9 @@ %dir %{_datadir}/scim/ %{_datadir}/scim/* -%changelog -n scim-input-pad +%changelog +* Thu Dec 27 2007 - crrodriguez(a)suse.de +- fix library-without-ldconfig-* errors * Sun Oct 29 2006 - meissner(a)suse.de - use optflags * Thu Oct 12 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

commit qnotify
by root＠Hilbert.suse.de 31 Dec '07

31 Dec '07

Hello community, here is the log from the commit of package qnotify checked in at Mon Dec 31 22:38:13 CET 2007. -------- --- qnotify/qnotify.changes 2007-10-23 10:37:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/qnotify/qnotify.changes 2007-12-27 06:57:42.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 27 06:57:17 CET 2007 - crrodriguez(a)suse.de + +- fix library-without-ldconfig-* errors + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qnotify.spec ++++++ --- /var/tmp/diff_new_pack.E16073/_old 2007-12-31 22:38:00.000000000 +0100 +++ /var/tmp/diff_new_pack.E16073/_new 2007-12-31 22:38:00.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: libdrm-devel libjpeg-devel qt3-devel update-desktop-files Summary: Notifications for multiple workspaces Version: 0.5.2 -Release: 113 +Release: 131 License: GPL v2 or later Url: http://qnotify.homac.de Group: System/GUI/Other @@ -22,11 +22,6 @@ Patch: %{name}-fix-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package libs -Summary: Library to be used by other applications for displaying nice popups -AutoReqProv: on -Group: Development/Libraries/C and C++ - %description QNotify is a small and windowmanager independent utility to inform you of events of any kind. When a specific event occurres, a small window @@ -51,6 +46,10 @@ -------- Holger Macht +%package libs +Summary: Library to be used by other applications for displaying nice popups +Group: Development/Libraries/C and C++ + %description libs LibQNotify is a library intended for use with other Qt or KDE applications. It provides an easy to use API for displaying highly @@ -64,7 +63,7 @@ Holger Macht <holger(a)homac.de> %prep -%setup +%setup -q %patch %build @@ -72,7 +71,7 @@ autoconf autoheader automake -a -./configure --with-qtdir=%_libdir/qt3 --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir +%configure --with-qtdir=%_libdir/qt3 --disable-static make %install @@ -82,6 +81,10 @@ %clean +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %files %defattr(-,root,root) /usr/bin/qnotify @@ -94,9 +97,11 @@ %defattr(-,root,root) %_libdir/lib*.so* %_libdir/lib*.la -%_libdir/lib*.a %_includedir/* + %changelog +* Thu Dec 27 2007 - crrodriguez(a)suse.de +- fix library-without-ldconfig-* errors * Tue Oct 23 2007 - hmacht(a)suse.de - add qnotify-fix-inlcudes.patch to fix errors due to gcc4.3 * Thu Aug 24 2006 - cthiel(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