- crux-commits - lists.crux.nu

r1181 - crux-2.2/ports/opt/kdenetwork
by crux＠crux.nu 08 Apr '06

08 Apr '06

Author: sten Date: 2006-04-08 12:22:31 +0200 (Sat, 08 Apr 2006) New Revision: 1181 Added: crux-2.2/ports/opt/kdenetwork/lisa.conf Modified: crux-2.2/ports/opt/kdenetwork/.footprint crux-2.2/ports/opt/kdenetwork/Pkgfile crux-2.2/ports/opt/kdenetwork/README Log: kdenetwork: fix https://crux.nu/bugs/?do=details&id=39; update to 3.5.2; update README Modified: crux-2.2/ports/opt/kdenetwork/.footprint =================================================================== --- crux-2.2/ports/opt/kdenetwork/.footprint 2006-04-08 09:44:31 UTC (rev 1180) +++ crux-2.2/ports/opt/kdenetwork/.footprint 2006-04-08 10:22:31 UTC (rev 1181) @@ -1,5 +1,4 @@ drwxr-xr-x root/root etc/ --rw-r--r-- root/root etc/lisa.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/lisa drwxr-xr-x root/root usr/ @@ -1459,7 +1458,10 @@ drwxr-xr-x root/root usr/share/apps/kppp/Rules/Kazakhstan/ -rw-r--r-- root/root usr/share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst drwxr-xr-x root/root usr/share/apps/kppp/Rules/Luxembourg/ --rw-r--r-- root/root usr/share/apps/kppp/Rules/Luxembourg/Local.rst +-rw-r--r-- root/root usr/share/apps/kppp/Rules/Luxembourg/CMD_InternetGratuit.rst +-rw-r--r-- root/root usr/share/apps/kppp/Rules/Luxembourg/LuxembourgOnline_FreeInternet.rst +-rw-r--r-- root/root usr/share/apps/kppp/Rules/Luxembourg/PetT_ClassicSurf.rst +-rw-r--r-- root/root usr/share/apps/kppp/Rules/Luxembourg/PetT_KioskSurf.rst drwxr-xr-x root/root usr/share/apps/kppp/Rules/Macedonia/ -rw-r--r-- root/root usr/share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst -rw-r--r-- root/root usr/share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst @@ -1773,6 +1775,167 @@ drwxr-xr-x root/root usr/share/config/ -rw-r--r-- root/root usr/share/config/ksircrc -rw-r--r-- root/root usr/share/config/ktalkdrc +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/HTML/ +drwxr-xr-x root/root usr/share/doc/HTML/en/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kcontrol/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kcontrol/kcmtalkd/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kcontrol/kcmtalkd/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kcontrol/kcmtalkd/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kcontrol/kcmtalkd/index.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/kcontrol/lanbrowser/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kcontrol/lanbrowser/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kcontrol/lanbrowser/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kcontrol/lanbrowser/index.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/kdenetwork-apidocs/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kdenetwork-apidocs/kopete/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kdenetwork-apidocs/kopete/html/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html/ +drwxr-xr-x root/root usr/share/doc/HTML/en/kdict/ +-rw-r--r-- root/root usr/share/doc/HTML/en/kdict/applet.png +lrwxrwxrwx root/root usr/share/doc/HTML/en/kdict/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kdict/conf.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kdict/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kdict/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kdict/mainwin.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kdict/seteditor.png +drwxr-xr-x root/root usr/share/doc/HTML/en/kget/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kget/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/fileopen.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/kget1.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/kget2.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/kget3.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/kget4.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kget/kget5.png +drwxr-xr-x root/root usr/share/doc/HTML/en/knewsticker/ +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/TODO +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/about-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/checknews-icon.png +lrwxrwxrwx root/root usr/share/doc/HTML/en/knewsticker/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/contextmenu.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/help-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/kcmnewsticker-filters.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/kcmnewsticker-general.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/kcmnewsticker-newssources.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/kcontrol-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/knewsticker-childpanel.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/knewsticker-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/knewsticker-kicker.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/knewsticker-ownwindow.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/newarticle-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/newssite-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/oldarticle-icon.png +-rw-r--r-- root/root usr/share/doc/HTML/en/knewsticker/preferences-icon.png +drwxr-xr-x root/root usr/share/doc/HTML/en/kopete/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kopete/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kopete/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kopete/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kopete/menus.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/kpf/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kpf/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kpf/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kpf/index.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/kppp/ +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/accounting.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/callback.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/chap.docbook +lrwxrwxrwx root/root usr/share/doc/HTML/en/kppp/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/costsgraphs.fig +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/costsgraphs.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/dialog-setup.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/getting-online.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/global-settings.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/hayes.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-accounting-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-dial-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-dns-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-execute-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-gateway-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-ip-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-account-login-script-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-config.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-device-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-dialler-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-faq.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-graph-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-misc-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-modem-tab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp-wizard.png +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/kppp.faq.question +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/security.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/tricks.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/ttyS-cua.txt +-rw-r--r-- root/root usr/share/doc/HTML/en/kppp/wizard.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/krdc/ +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/authentication.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/authentication.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/close.png +lrwxrwxrwx root/root usr/share/doc/HTML/en/krdc/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/krdc_window.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/krdc_window.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/preferences_profilestab.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/preferences_profilestab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/preferences_rdpdefaultstab.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/preferences_rdpdefaultstab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/preferences_vncdefaultstab.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/preferences_vncdefaultstab.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot_connectionspeed.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot_connectionspeed.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot_nobrowse.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot_nobrowse.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot_vncentry.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/snapshot_vncentry.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/window_fullscreen.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krdc/window_nofullscreen.png +drwxr-xr-x root/root usr/share/doc/HTML/en/krfb/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/krfb/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/configuration_access.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/configuration_access.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/configuration_network.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/configuration_network.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/configuration_session.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/configuration_session.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/connection.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/connection.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/email_invitation.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/email_invitation.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/index.docbook +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/invitation_management.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/invitation_management.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/personal_invitation.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/personal_invitation.png +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/screenshot.eps +-rw-r--r-- root/root usr/share/doc/HTML/en/krfb/screenshot.png +drwxr-xr-x root/root usr/share/doc/HTML/en/ksirc/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/ksirc/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/ksirc/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/ksirc/index.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/ktalkd/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/ktalkd/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/ktalkd/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/ktalkd/index.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/kwifimanager/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/kwifimanager/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/kwifimanager/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/kwifimanager/index.docbook +drwxr-xr-x root/root usr/share/doc/HTML/en/lisa/ +lrwxrwxrwx root/root usr/share/doc/HTML/en/lisa/common -> /usr/share/doc/HTML/en/common +-rw-r--r-- root/root usr/share/doc/HTML/en/lisa/index.cache.bz2 +-rw-r--r-- root/root usr/share/doc/HTML/en/lisa/index.docbook drwxr-xr-x root/root usr/share/icons/ drwxr-xr-x root/root usr/share/icons/crystalsvg/ drwxr-xr-x root/root usr/share/icons/crystalsvg/128x128/ Modified: crux-2.2/ports/opt/kdenetwork/Pkgfile =================================================================== --- crux-2.2/ports/opt/kdenetwork/Pkgfile 2006-04-08 09:44:31 UTC (rev 1180) +++ crux-2.2/ports/opt/kdenetwork/Pkgfile 2006-04-08 10:22:31 UTC (rev 1181) @@ -6,7 +6,7 @@ name=kdenetwork version=3.5.2 -release=2 +release=3 source=(http://download.kde.org/stable/3.5.2/src/$name-$version.tar.bz2\ lisa) @@ -19,5 +19,4 @@ make make DESTDIR=$PKG install install -D ../lisa $PKG/etc/rc.d/lisa - cp debian/lisarc $PKG/etc/lisa.conf } Modified: crux-2.2/ports/opt/kdenetwork/README =================================================================== --- crux-2.2/ports/opt/kdenetwork/README 2006-04-08 09:44:31 UTC (rev 1180) +++ crux-2.2/ports/opt/kdenetwork/README 2006-04-08 10:22:31 UTC (rev 1181) @@ -2,7 +2,11 @@ /etc/rc.d/lisa starts LISa, the LAN Information Server. -LISa is intended to provide a kind of "network neighborhood" but only relying on the TCP/IP protocol stack, no smb or whatever. +LISa is intended to provide a kind of "network neighbourhood", although +it only relies on the TCP/IP protocol stack--no SMB or whatever. -You'll need to run kcontrol -> Internet & Network -> Local Network Browing. -/etc/rc.d/lisa start, and network browing is go! \ No newline at end of file +You'll need to run kcontrol -> Internet & Network -> Local Network +Browsing. /etc/rc.d/lisa start, and network browsing is go! + +Included in this directory is a sample /etc/lisa.conf, in case you +need one. Added: crux-2.2/ports/opt/kdenetwork/lisa.conf =================================================================== --- crux-2.2/ports/opt/kdenetwork/lisa.conf (rev 0) +++ crux-2.2/ports/opt/kdenetwork/lisa.conf 2006-04-08 10:22:31 UTC (rev 1181) @@ -0,0 +1,11 @@ +PingAddresses = 127.0.0.1/255.255.255.255; +PingNames = +AllowedAddresses = 127.0.0.1/255.255.255.255 +BroadcastNetwork = 127.0.0.1/255.255.255.255 +SearchUsingNmblookup = 0 #also try nmblookup +FirstWait = 30 #30 hundredth seconds +SecondWait = -1 #only one try +#SecondWait = 60 #the second time wait 0.6 seconds +UpdatePeriod = 300 #update after 300 secs +DeliverUnnamedHosts = 0 #don't publish hosts without name +MaxPingsAtOnce = 256 #send up to 256 pings at once

1 0

r1180 - crux-2.2/ports/core/prt-get
by crux＠crux.nu 08 Apr '06

08 Apr '06

Author: jw Date: 2006-04-08 11:44:31 +0200 (Sat, 08 Apr 2006) New Revision: 1180 Modified: crux-2.2/ports/core/prt-get/.md5sum crux-2.2/ports/core/prt-get/Pkgfile crux-2.2/ports/core/prt-get/prt-get-0.5.11-deptree-alias.diff Log: prt-get (the port): fix aliases in deptree, thanks Mark Rosenstand Modified: crux-2.2/ports/core/prt-get/.md5sum =================================================================== --- crux-2.2/ports/core/prt-get/.md5sum 2006-04-08 09:41:02 UTC (rev 1179) +++ crux-2.2/ports/core/prt-get/.md5sum 2006-04-08 09:44:31 UTC (rev 1180) @@ -1,4 +1,4 @@ -cb47e392c3d0ee6042f68f48f2b36bca prt-get-0.5.11-deptree-alias.diff +dc3d731bac68c9bda567a60063a85139 prt-get-0.5.11-deptree-alias.diff a9297b69ec9eacd555b291bc9ef50ad5 prt-get-0.5.11.tar.gz 9fefdc42a8a106f7d2c2036ba3b2f9fb prt-get.aliases 6e79b7ce2987c6ae4382c74e742cc7ac prt-get.conf Modified: crux-2.2/ports/core/prt-get/Pkgfile =================================================================== --- crux-2.2/ports/core/prt-get/Pkgfile 2006-04-08 09:41:02 UTC (rev 1179) +++ crux-2.2/ports/core/prt-get/Pkgfile 2006-04-08 09:44:31 UTC (rev 1180) @@ -4,7 +4,7 @@ name=prt-get version=0.5.11 -release=4 +release=5 source=(http://jw.tks6.net/files/crux/prt-get-$version.tar.gz \ prt-get.conf prt-get.aliases \ prt-get-0.5.11-deptree-alias.diff) Modified: crux-2.2/ports/core/prt-get/prt-get-0.5.11-deptree-alias.diff =================================================================== --- crux-2.2/ports/core/prt-get/prt-get-0.5.11-deptree-alias.diff 2006-04-08 09:41:02 UTC (rev 1179) +++ crux-2.2/ports/core/prt-get/prt-get-0.5.11-deptree-alias.diff 2006-04-08 09:44:31 UTC (rev 1180) @@ -23,3 +23,18 @@ const Package* p = m_repo->getPackage( *it ); if (p) { if (p->dependencies().length() > 0) { +Index: pkgdb.cpp +=================================================================== +--- prt-get-0.5.11/src/pkgdb.cpp (revision 1137) ++++ prt-get-0.5.11/src/pkgdb.cpp (working copy) +@@ -68,6 +68,10 @@ + *aliasOrignalName = provider; + } + } ++ } else { ++ if (isAlias) { ++ *isAlias = false; ++ } + } + + return installed;

1 0

r1179 - in tools/prt-get/trunk: . src
by crux＠crux.nu 08 Apr '06

08 Apr '06

Author: jw Date: 2006-04-08 11:41:02 +0200 (Sat, 08 Apr 2006) New Revision: 1179 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/src/pkgdb.cpp tools/prt-get/trunk/src/prtget.cpp Log: prt-get: hidden within trailing whitespace removals, a fix for aliases in deptree Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-07 21:13:11 UTC (rev 1178) +++ tools/prt-get/trunk/ChangeLog 2006-04-08 09:41:02 UTC (rev 1179) @@ -11,6 +11,7 @@ - Make 'cat' and 'readme' use $PAGER if set - update default prt-get.conf to reflect new port hierarchy (core/opt/contrib) - add timestamps to log files +- fix aliasing bug introduce earlier in the .12 session (thanks Mark) * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/src/pkgdb.cpp =================================================================== --- tools/prt-get/trunk/src/pkgdb.cpp 2006-04-07 21:13:11 UTC (rev 1178) +++ tools/prt-get/trunk/src/pkgdb.cpp 2006-04-08 09:41:02 UTC (rev 1179) @@ -55,7 +55,7 @@ if ( !load() ) { return false; } - + bool installed = m_packages.find( name ) != m_packages.end(); if (!installed && useAlias) { string provider; @@ -68,6 +68,10 @@ *aliasOrignalName = provider; } } + } else { + if (isAlias) { + *isAlias = false; + } } return installed; @@ -81,13 +85,13 @@ map<string, string>::iterator it = m_aliases.begin(); for (; it != m_aliases.end(); ++it) { StringHelper::split(it->second, ',', - m_splitAliases[it->first]); + m_splitAliases[it->first]); } } - + map<string, vector<string> >::iterator it = m_splitAliases.begin(); for (; it != m_splitAliases.end(); ++it) { - if (find(it->second.begin(), it->second.end(), name) != + if (find(it->second.begin(), it->second.end(), name) != it->second.end()) { providerName = it->first; return true; Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-07 21:13:11 UTC (rev 1178) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-08 09:41:02 UTC (rev 1179) @@ -1225,12 +1225,12 @@ if (!File::fileExists(file)) { return false; } - + char* pager = getenv("PAGER"); if (pager) { Process proc(pager, file); proc.executeShell(); - } else { + } else { FILE* fp = fopen( file.c_str(), "r" ); char buf[255]; if ( fp ) { @@ -1240,7 +1240,7 @@ fclose( fp ); } } - + return true; }

1 0

r1178 - crux-2.2/ports/core/prt-get
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: jw Date: 2006-04-07 23:13:11 +0200 (Fri, 07 Apr 2006) New Revision: 1178 Modified: crux-2.2/ports/core/prt-get/.md5sum crux-2.2/ports/core/prt-get/prt-get.aliases Log: prt-get: update aliases file Modified: crux-2.2/ports/core/prt-get/.md5sum =================================================================== --- crux-2.2/ports/core/prt-get/.md5sum 2006-04-07 17:52:04 UTC (rev 1177) +++ crux-2.2/ports/core/prt-get/.md5sum 2006-04-07 21:13:11 UTC (rev 1178) @@ -1,4 +1,4 @@ cb47e392c3d0ee6042f68f48f2b36bca prt-get-0.5.11-deptree-alias.diff a9297b69ec9eacd555b291bc9ef50ad5 prt-get-0.5.11.tar.gz -365211e94a0736e05503344e1b02e883 prt-get.aliases +9fefdc42a8a106f7d2c2036ba3b2f9fb prt-get.aliases 6e79b7ce2987c6ae4382c74e742cc7ac prt-get.conf Modified: crux-2.2/ports/core/prt-get/prt-get.aliases =================================================================== --- crux-2.2/ports/core/prt-get/prt-get.aliases 2006-04-07 17:52:04 UTC (rev 1177) +++ crux-2.2/ports/core/prt-get/prt-get.aliases 2006-04-07 21:13:11 UTC (rev 1178) @@ -1,5 +1,5 @@ j2sdk: j2re -lesstif: openmotif +openmotif: lesstif postfix: sendmail exim: sendmail qmail: sendmail

1 0

r1177 - in crux-2.2: . iso/bin iso/isolinux ports
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: jaeger Date: 2006-04-07 19:52:04 +0200 (Fri, 07 Apr 2006) New Revision: 1177 Added: crux-2.2/iso/isolinux/memtest86 crux-2.2/iso/isolinux/options.msg crux-2.2/iso/isolinux/roots.msg crux-2.2/ports/checkdups Modified: crux-2.2/Makefile crux-2.2/iso/bin/setup crux-2.2/iso/isolinux/boot.msg crux-2.2/iso/isolinux/isolinux.cfg Log: crux-2.2: fixed kernel source permissions during setup, added boot messages, options, and memtest86 to isolinux and Makefile, added script for checking package duplicates for iso creation Modified: crux-2.2/Makefile =================================================================== --- crux-2.2/Makefile 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/Makefile 2006-04-07 17:52:04 UTC (rev 1177) @@ -182,7 +182,7 @@ @echo "- Copying ISO specific files" @mkdir -p $(ISO_ROOT_DIR)/etc $(ISO_ROOT_DIR)/boot/isolinux @cp iso/syslinux-$(SYSLINUX_VERSION)/isolinux.bin $(ISO_ROOT_DIR)/boot/isolinux - @cp iso/isolinux/{isolinux.cfg,boot.msg} $(ISO_ROOT_DIR)/boot/isolinux + @cp iso/isolinux/{isolinux.cfg,*.msg,memtest86} $(ISO_ROOT_DIR)/boot/isolinux @cp iso/etc/{fstab,hosts,inittab,issue,ld.so.conf,protocols,rc,rc.shutdown,rc.single,services} $(ISO_ROOT_DIR)/etc @echo "- Updating library links and cache" @ldconfig -r $(ISO_ROOT_DIR) Modified: crux-2.2/iso/bin/setup =================================================================== --- crux-2.2/iso/bin/setup 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/iso/bin/setup 2006-04-07 17:52:04 UTC (rev 1177) @@ -177,6 +177,7 @@ tar -C $ROOT/usr/src -xjf $KERNEL cp -f ./kernel/linux-$KERNEL_VERSION.config $ROOT/usr/src/linux-$KERNEL_VERSION/.config chown -R root.root $ROOT/usr/src/linux-$KERNEL_VERSION + chmod -R go-w $ROOT/usr/src/linux-$KERNEL_VERSION shopt -s nullglob for patch in ./kernel/linux-$KERNEL_VERSION-*.patch; do patch -s -d $ROOT/usr/src/linux-$KERNEL_VERSION -p1 < $patch Modified: crux-2.2/iso/isolinux/boot.msg =================================================================== --- crux-2.2/iso/isolinux/boot.msg 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/iso/isolinux/boot.msg 2006-04-07 17:52:04 UTC (rev 1177) @@ -1,7 +1,13 @@ Welcome to CRUX 2.2 -Press <Enter> to boot using the CD-ROM (/dev/hdc) as root filesystem. +Press <ENTER> to boot using the CD-ROM (default: /dev/hdc) as +the root filesystem. -To change root filesystem type: CRUX root=/dev/<device> -To disable ACPI type: CRUX acpi=off +Available kernels: + CRUX (install CRUX) + memtest86 (test your system's RAM) +Press F2 to see options for changing the root filesystem. + (if your CDROM is not the secondary master device, look here.) +Press F3 to see miscellaneous boot options (acpi, etc.) + Modified: crux-2.2/iso/isolinux/isolinux.cfg =================================================================== --- crux-2.2/iso/isolinux/isolinux.cfg 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/iso/isolinux/isolinux.cfg 2006-04-07 17:52:04 UTC (rev 1177) @@ -2,6 +2,14 @@ DISPLAY /boot/isolinux/boot.msg PROMPT 1 DEFAULT CRUX + +F1 boot.msg +F2 roots.msg +F3 options.msg + LABEL CRUX KERNEL /boot/vmlinuz APPEND root=/dev/hdc ro console=ttyS0,38400 console=tty0 + +LABEL memtest86 + KERNEL memtest86 Added: crux-2.2/iso/isolinux/memtest86 =================================================================== (Binary files differ) Property changes on: crux-2.2/iso/isolinux/memtest86 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: crux-2.2/iso/isolinux/options.msg =================================================================== --- crux-2.2/iso/isolinux/options.msg (rev 0) +++ crux-2.2/iso/isolinux/options.msg 2006-04-07 17:52:04 UTC (rev 1177) @@ -0,0 +1,13 @@ + +Boot options: + + acpi=off This option disables ACPI; it's required to use APM (older + non-acpi hardware) and also disables hyperthreading. Try + this if your hardware is older and has trouble booting the + default way. + + console=<blah> This option configures serial port access for the boot CD. + The format is "device,connection options", the default is + "ttyS0,38400". Connection options are comma-separated. For + example: console=9600,8,n,1 + Added: crux-2.2/iso/isolinux/roots.msg =================================================================== --- crux-2.2/iso/isolinux/roots.msg (rev 0) +++ crux-2.2/iso/isolinux/roots.msg 2006-04-07 17:52:04 UTC (rev 1177) @@ -0,0 +1,17 @@ + +Root filesystem: + + The default root filesystem is /dev/hdc, which corresponds to the + secondary master in the IDE chain. If your CDROM drive is not the + secondary master, you'll need to pass the root filesystem device + accordingly. Use the following table: + + Primary master: hda + Primary slave: hdb + Secondary master: hdc + Secondary slave: hdd + + So if your CDROM drive is the primary slave, boot with the following: + + CRUX root=/dev/hdb + Added: crux-2.2/ports/checkdups =================================================================== --- crux-2.2/ports/checkdups (rev 0) +++ crux-2.2/ports/checkdups 2006-04-07 17:52:04 UTC (rev 1177) @@ -0,0 +1,11 @@ +#!/bin/sh + +echo "Checking for duplicate packages..." + +DUPS="`find . -name \"*.pkg.tar.gz\" | cut -d/ -f4 | cut -d# -f1 | uniq -d`" + +if [ ! -z "$DUPS" ] +then + echo "Duplicate(s) found:" + echo $DUPS +fi Property changes on: crux-2.2/ports/checkdups ___________________________________________________________________ Name: svn:executable + *

1 0

r1176 - crux-2.2/ports/opt/gnupg
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: viper Date: 2006-04-07 18:16:36 +0200 (Fri, 07 Apr 2006) New Revision: 1176 Added: crux-2.2/ports/opt/gnupg/gnupg-1.4.3-mguard.patch Modified: crux-2.2/ports/opt/gnupg/.md5sum crux-2.2/ports/opt/gnupg/Pkgfile Log: gnupg: readded --enable-m-guard; danm has created a nice well-working patch Modified: crux-2.2/ports/opt/gnupg/.md5sum =================================================================== --- crux-2.2/ports/opt/gnupg/.md5sum 2006-04-07 16:11:29 UTC (rev 1175) +++ crux-2.2/ports/opt/gnupg/.md5sum 2006-04-07 16:16:36 UTC (rev 1176) @@ -1,2 +1,3 @@ +9c27490749384afffca5d7d18aaaf276 gnupg-1.4.3-mguard.patch d237d8fe1c4afa379f56dbda0e0b40e4 gnupg-1.4.3.tar.bz2 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz Modified: crux-2.2/ports/opt/gnupg/Pkgfile =================================================================== --- crux-2.2/ports/opt/gnupg/Pkgfile 2006-04-07 16:11:29 UTC (rev 1175) +++ crux-2.2/ports/opt/gnupg/Pkgfile 2006-04-07 16:16:36 UTC (rev 1176) @@ -5,13 +5,17 @@ name=gnupg version=1.4.3 -release=1 +release=2 source=(ftp://ftp.gnupg.org/gcrypt/gnupg/$name-$version.tar.bz2 \ - ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz) + ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz \ + $name-$version-mguard.patch) build () { cd $name-$version + # necessary because of --enable-m-guard + patch -p1 < $SRC/$name-$version-mguard.patch + zcat ../idea.c.gz > cipher/idea.c ./configure \ @@ -19,13 +23,11 @@ --libexecdir=/usr/lib \ --enable-static-rnd=linux \ --enable-dev-random \ + --enable-m-guard \ --disable-nls \ --disable-ldap \ --enable-mailto -# doesn't work in 1.4.3 -# --enable-m-guard \ - make make DESTDIR=$PKG install Added: crux-2.2/ports/opt/gnupg/gnupg-1.4.3-mguard.patch =================================================================== --- crux-2.2/ports/opt/gnupg/gnupg-1.4.3-mguard.patch (rev 0) +++ crux-2.2/ports/opt/gnupg/gnupg-1.4.3-mguard.patch 2006-04-07 16:16:36 UTC (rev 1176) @@ -0,0 +1,23 @@ +diff -Nru gnupg-1.4.3-old/util/memory.c gnupg-1.4.3/util/memory.c +--- gnupg-1.4.3-old/util/memory.c 2006-04-06 23:28:07.875803000 +0000 ++++ gnupg-1.4.3/util/memory.c 2006-04-06 23:29:02.695229000 +0000 +@@ -509,15 +509,15 @@ + if( len >= n ) /* we don't shrink for now */ + return a; + if( p[-1] == MAGIC_SEC_BYTE ) +- b = FNAME(alloc_secure_clear)(n FNAMEARG); ++ b = FNAMEXM(alloc_secure_clear)(n FNAMEARG); + else +- b = FNAME(alloc_clear)(n FNAMEARG); ++ b = FNAMEXM(alloc_clear)(n FNAMEARG); + FNAME(check)(NULL FNAMEARG); + memcpy(b, a, len ); +- FNAME(free)(p FNAMEARG); ++ FNAMEX(free)(p FNAMEARG); + } + else +- b = FNAME(alloc)(n FNAMEARG); ++ b = FNAMEXM(alloc)(n FNAMEARG); + #else + if( m_is_secure(a) ) { + if( !(b = secmexrealloc( a, n )) )

1 0

r1175 - crux-2.2/ports/core/wget
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: jheino Date: 2006-04-07 18:11:29 +0200 (Fri, 07 Apr 2006) New Revision: 1175 Modified: crux-2.2/ports/core/wget/Pkgfile Log: wget: added openssl dependency information Modified: crux-2.2/ports/core/wget/Pkgfile =================================================================== --- crux-2.2/ports/core/wget/Pkgfile 2006-04-07 16:07:45 UTC (rev 1174) +++ crux-2.2/ports/core/wget/Pkgfile 2006-04-07 16:11:29 UTC (rev 1175) @@ -2,6 +2,7 @@ # URL: http://www.gnu.org/software/wget/ # Maintainer: Jukka Heino, jukka at karsikkopuu dot net # Packager: Per Lid�n, per at fukt dot bth dot se +# Depends on: openssl name=wget version=1.10.2

1 0

r1174 - crux-2.2/ports/core/wget
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: jheino Date: 2006-04-07 18:07:45 +0200 (Fri, 07 Apr 2006) New Revision: 1174 Modified: crux-2.2/ports/core/wget/Pkgfile Log: wget: assumed maintainership, enabled SSL support Modified: crux-2.2/ports/core/wget/Pkgfile =================================================================== --- crux-2.2/ports/core/wget/Pkgfile 2006-04-07 11:04:40 UTC (rev 1173) +++ crux-2.2/ports/core/wget/Pkgfile 2006-04-07 16:07:45 UTC (rev 1174) @@ -1,10 +1,11 @@ # Description: A network utility for downloading content from the Web # URL: http://www.gnu.org/software/wget/ -# Maintainer: Per Lid�n <per(a)fukt.bth.se> +# Maintainer: Jukka Heino, jukka at karsikkopuu dot net +# Packager: Per Lid�n, per at fukt dot bth dot se name=wget version=1.10.2 -release=1 +release=2 source=(http://mirrors.sunsite.dk/gnu/$name/$name-$version.tar.gz \ wgetrc) @@ -12,7 +13,6 @@ cd $name-$version ./configure --prefix=/usr \ --sysconfdir=/etc \ - --without-ssl \ --disable-debug \ --disable-nls make

1 0

r1173 - crux-2.2/ports/opt/postfix
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: viper Date: 2006-04-07 13:04:40 +0200 (Fri, 07 Apr 2006) New Revision: 1173 Modified: crux-2.2/ports/opt/postfix/.md5sum crux-2.2/ports/opt/postfix/Pkgfile Log: postfix: update to 2.2.10 Modified: crux-2.2/ports/opt/postfix/.md5sum =================================================================== --- crux-2.2/ports/opt/postfix/.md5sum 2006-04-07 11:04:20 UTC (rev 1172) +++ crux-2.2/ports/opt/postfix/.md5sum 2006-04-07 11:04:40 UTC (rev 1173) @@ -1,3 +1,3 @@ be543b65525f544386a2d8395ea19cdf aliases -be78631bd9b6bf7735e43abfa54d69f6 postfix-2.2.9.tar.gz +440a4702182a79ac2f51e8974fb742c9 postfix-2.2.10.tar.gz d18be5c17604f9c712a28339ff0f61cb postfix.rc Modified: crux-2.2/ports/opt/postfix/Pkgfile =================================================================== --- crux-2.2/ports/opt/postfix/Pkgfile 2006-04-07 11:04:20 UTC (rev 1172) +++ crux-2.2/ports/opt/postfix/Pkgfile 2006-04-07 11:04:40 UTC (rev 1173) @@ -5,7 +5,7 @@ # Depends on: cyrus-sasl, openssl, db name=postfix -version=2.2.9 +version=2.2.10 release=1 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$name-$ver… aliases postfix.rc)

1 0

r1172 - crux-2.1/ports/opt/postfix
by crux＠crux.nu 07 Apr '06

07 Apr '06

Author: viper Date: 2006-04-07 13:04:20 +0200 (Fri, 07 Apr 2006) New Revision: 1172 Modified: crux-2.1/ports/opt/postfix/.md5sum crux-2.1/ports/opt/postfix/Pkgfile Log: [security] postfix: update to version 2.2.10 (update isn't important but recommand: ftp://ftp.fu-berlin.de/unix/mail/postfix/official/postfix-2.2.10.HISTORY) Modified: crux-2.1/ports/opt/postfix/.md5sum =================================================================== --- crux-2.1/ports/opt/postfix/.md5sum 2006-04-07 08:47:22 UTC (rev 1171) +++ crux-2.1/ports/opt/postfix/.md5sum 2006-04-07 11:04:20 UTC (rev 1172) @@ -1,3 +1,3 @@ be543b65525f544386a2d8395ea19cdf aliases -be78631bd9b6bf7735e43abfa54d69f6 postfix-2.2.9.tar.gz +440a4702182a79ac2f51e8974fb742c9 postfix-2.2.10.tar.gz d18be5c17604f9c712a28339ff0f61cb postfix.rc Modified: crux-2.1/ports/opt/postfix/Pkgfile =================================================================== --- crux-2.1/ports/opt/postfix/Pkgfile 2006-04-07 08:47:22 UTC (rev 1171) +++ crux-2.1/ports/opt/postfix/Pkgfile 2006-04-07 11:04:20 UTC (rev 1172) @@ -5,7 +5,7 @@ # Depends on: cyrus-sasl, openssl, db name=postfix -version=2.2.9 +version=2.2.10 release=1 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$name-$ver… aliases postfix.rc)

1 0