Apply apt-0.5.15cnc5-alt-distro.patch

Added in commit e3ad0ef:

- Added librpm-4.0.4 build support.
- Built with librpm-4.0.4, updated buildrequires.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 20:15:37 +04:00
parent 6a89824004
commit 4402a20942
3 changed files with 2 additions and 26 deletions

View File

@ -1,24 +0,0 @@
diff -uprk.orig apt-0.5.15cnc5.orig/apt-pkg/rpm/rpmsystem.cc apt-0.5.15cnc5/apt-pkg/rpm/rpmsystem.cc
--- apt-0.5.15cnc5.orig/apt-pkg/rpm/rpmsystem.cc 2003-12-23 23:19:32 +0300
+++ apt-0.5.15cnc5/apt-pkg/rpm/rpmsystem.cc 2004-01-16 15:11:40 +0300
@@ -132,7 +132,7 @@ bool rpmSystem::Initialize(Configuration
Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
Cnf.CndSet("Dir::State::prefetch", "prefetch");
Cnf.CndSet("Dir::Locale","/usr/share/locale");
- Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee
+ Cnf.CndSet("Acquire::DistroID","ALT Linux"); // hee hee
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
diff -uprk.orig apt-0.5.15cnc5.orig/methods/ftp.cc apt-0.5.15cnc5/methods/ftp.cc
--- apt-0.5.15cnc5.orig/methods/ftp.cc 2003-12-23 23:24:24 +0300
+++ apt-0.5.15cnc5/methods/ftp.cc 2004-01-16 15:11:40 +0300
@@ -190,7 +190,7 @@ bool FTPConn::Login()
// Setup the variables needed for authentication
string User = "anonymous";
// CNC:2003-06-16
- string Pass = "apt_get_ftp_2.1@rpm.linux.user";
+ string Pass = "apt_get_ftp_2.1@alt.linux.user";
// Fill in the user/pass
if (ServerName.User.empty() == false)

View File

@ -141,7 +141,7 @@ bool rpmSystem::Initialize(Configuration &Cnf)
Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d"); Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
Cnf.CndSet("Dir::State::prefetch", "prefetch"); Cnf.CndSet("Dir::State::prefetch", "prefetch");
Cnf.CndSet("Dir::Locale","/usr/share/locale"); Cnf.CndSet("Dir::Locale","/usr/share/locale");
Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee Cnf.CndSet("Acquire::DistroID","ALT Linux"); // hee hee
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom"); Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true"); Cnf.CndSet("Acquire::CDROM::Copy-All", "true");

View File

@ -190,7 +190,7 @@ bool FTPConn::Login()
// Setup the variables needed for authentication // Setup the variables needed for authentication
string User = "anonymous"; string User = "anonymous";
// CNC:2003-06-16 // CNC:2003-06-16
string Pass = "apt_get_ftp_2.1@rpm.linux.user"; string Pass = "apt_get_ftp_2.1@alt.linux.user";
// Fill in the user/pass // Fill in the user/pass
if (ServerName.User.empty() == false) if (ServerName.User.empty() == false)