0.5.15cnc6-alt12
- apt-pipe: inactivity timeout removed - apt-pipe: do not copy packages from cdrom during install
This commit is contained in:
Sergey Bolshakov
parent
8b55ef8c63
commit
422369f2c0
@ -1,7 +1,7 @@
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-pipe.c apt-0.5.15cnc6/cmdline/apt-pipe.c
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-pipe.c 1970-01-01 03:00:00 +0300
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-pipe.c 2005-05-04 13:26:03 +0400
|
||||
@@ -0,0 +1,381 @@
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-pipe.c 2005-05-31 12:59:58 +0400
|
||||
@@ -0,0 +1,377 @@
|
||||
+/* ----------------------------------------------------------------------------
|
||||
+ $Id: apt-pipe.c,v 1.3 2005/03/20 20:56:03 me Exp $
|
||||
+ */
|
||||
@ -54,13 +54,11 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-pipe.c apt-0.5.15cnc6/cmdline/apt-pipe
|
||||
+ sigaddset(&sa.sa_mask, SIGINT);
|
||||
+ sigaddset(&sa.sa_mask, SIGTERM);
|
||||
+ sigaddset(&sa.sa_mask, SIGHUP);
|
||||
+ sigaddset(&sa.sa_mask, SIGALRM);
|
||||
+ sa.sa_flags = flags;
|
||||
+
|
||||
+ (void) sigaction(SIGINT, &sa, NULL);
|
||||
+ (void) sigaction(SIGTERM, &sa, NULL);
|
||||
+ (void) sigaction(SIGHUP, &sa, NULL);
|
||||
+ (void) sigaction(SIGALRM, &sa, NULL);
|
||||
+}
|
||||
+
|
||||
+static int do_listen()
|
||||
@ -167,10 +165,8 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-pipe.c apt-0.5.15cnc6/cmdline/apt-pipe
|
||||
+
|
||||
+ /* enable EINTR while in accept */
|
||||
+ set_sighandler(0);
|
||||
+ alarm(180);
|
||||
+ if((cl = accept(servsock, NULL, 0)) < 0) continue;
|
||||
+
|
||||
+ alarm(0);
|
||||
+ set_sighandler(SA_RESTART);
|
||||
+ if ((received = recv_query(cl, buf, sizeof(buf), &fd)) > 0 && fd != -1)
|
||||
+ done = send_reply(cl, buf, received, fd);
|
||||
@ -384,8 +380,8 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-pipe.c apt-0.5.15cnc6/cmdline/apt-pipe
|
||||
+ return i;
|
||||
+}
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-shell.cc
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-shell.cc 2005-05-04 13:25:18 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-05-04 13:26:03 +0400
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-shell.cc 2005-05-31 12:56:51 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-05-31 13:00:50 +0400
|
||||
@@ -1,4 +1,4 @@
|
||||
-// -*- mode: cpp; mode: fold -*-
|
||||
+// -*- mode: c++; mode: folding -*-
|
||||
@ -403,7 +399,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
#include <fnmatch.h>
|
||||
/*}}}*/
|
||||
|
||||
@@ -3711,9 +3713,7 @@
|
||||
@@ -3721,9 +3723,7 @@
|
||||
return true;
|
||||
return _error->Error(_("No packages found"));
|
||||
}
|
||||
@ -414,7 +410,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
|
||||
// ShowHelp - Show a help screen /*{{{*/
|
||||
// ---------------------------------------------------------------------
|
||||
@@ -4090,6 +4090,7 @@
|
||||
@@ -4100,6 +4100,7 @@
|
||||
}
|
||||
/*}}}*/
|
||||
|
||||
@ -422,7 +418,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
// ReadLine* - readline library stuff /*{{{*/
|
||||
// ---------------------------------------------------------------------
|
||||
/* */
|
||||
@@ -4257,6 +4258,7 @@
|
||||
@@ -4267,6 +4268,7 @@
|
||||
write_history(History.c_str());
|
||||
}
|
||||
/*}}}*/
|
||||
@ -430,7 +426,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
|
||||
CommandLine::Args *CommandArgs(const char *Name)
|
||||
{
|
||||
@@ -4377,6 +4379,134 @@
|
||||
@@ -4387,6 +4389,138 @@
|
||||
}
|
||||
}
|
||||
/*}}}*/
|
||||
@ -474,6 +470,10 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
+ return 100;
|
||||
+ }
|
||||
+
|
||||
+ // add our nasty defaults
|
||||
+ _config->Set("Acquire::CDROM::Copy", "false");
|
||||
+ _config->Set("Acquire::CDROM::Copy-All", "false");
|
||||
+
|
||||
+ // Prepare the cache
|
||||
+ GCache = new CacheFile();
|
||||
+ GCache->Open();
|
||||
@ -565,17 +565,16 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
int main(int argc,const char *argv[])
|
||||
{
|
||||
CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate},
|
||||
@@ -4595,5 +4725,5 @@
|
||||
@@ -4605,5 +4739,5 @@
|
||||
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
// vim:sts=3:sw=3
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc.orig apt-0.5.15cnc6/cmdline/apt-shell.cc.orig
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/Makefile.am apt-0.5.15cnc6/cmdline/Makefile.am
|
||||
--- apt-0.5.15cnc6-orig/cmdline/Makefile.am 2005-05-04 13:25:18 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/Makefile.am 2005-05-04 13:26:03 +0400
|
||||
--- apt-0.5.15cnc6-orig/cmdline/Makefile.am 2005-05-31 12:56:51 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/Makefile.am 2005-05-31 12:59:58 +0400
|
||||
@@ -4,7 +4,7 @@
|
||||
bin_PROGRAMS = apt-get apt-cache apt-cdrom apt-config
|
||||
|
||||
|
||||
9
apt.spec
9
apt.spec
@ -1,8 +1,8 @@
|
||||
# $Id: apt,v 1.12 2005/05/17 13:28:24 me Exp $
|
||||
# $Id: apt,v 1.14 2005/05/31 09:04:36 me Exp $
|
||||
|
||||
Name: apt
|
||||
Version: 0.5.15cnc6
|
||||
Release: alt11
|
||||
Release: alt12
|
||||
|
||||
Summary: Debian's Advanced Packaging Tool with RPM support
|
||||
Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
|
||||
@ -352,6 +352,10 @@ fi
|
||||
# Probably %%doc with README.rsync?
|
||||
|
||||
%changelog
|
||||
* Tue May 31 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.5.15cnc6-alt12
|
||||
- apt-pipe: inactivity timeout removed
|
||||
- apt-pipe: do not copy packages from cdrom during install
|
||||
|
||||
* Wed May 18 2005 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc6-alt11
|
||||
- apt-get: corrected virtual package remove algorithm (#6276).
|
||||
- Updated default cdrom mount point (#6152).
|
||||
@ -829,3 +833,4 @@ fi
|
||||
# compile-command: "rpmbuild -ba --target=i586 apt.spec"
|
||||
# End:
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user