From 4402a20942a979da2e88697d5c12bf18636747fc Mon Sep 17 00:00:00 2001 From: Gleb Fotengauer-Malinovskiy Date: Fri, 16 May 2014 20:15:37 +0400 Subject: [PATCH] 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. --- apt-0.5.15cnc5-alt-distro.patch | 24 ------------------------ apt/apt-pkg/rpm/rpmsystem.cc | 2 +- apt/methods/ftp.cc | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 apt-0.5.15cnc5-alt-distro.patch diff --git a/apt-0.5.15cnc5-alt-distro.patch b/apt-0.5.15cnc5-alt-distro.patch deleted file mode 100644 index ab2df19..0000000 --- a/apt-0.5.15cnc5-alt-distro.patch +++ /dev/null @@ -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) diff --git a/apt/apt-pkg/rpm/rpmsystem.cc b/apt/apt-pkg/rpm/rpmsystem.cc index 886211c..5a8179f 100644 --- a/apt/apt-pkg/rpm/rpmsystem.cc +++ b/apt/apt-pkg/rpm/rpmsystem.cc @@ -141,7 +141,7 @@ bool rpmSystem::Initialize(Configuration &Cnf) 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 --git a/apt/methods/ftp.cc b/apt/methods/ftp.cc index fda89cb..09932ed 100644 --- a/apt/methods/ftp.cc +++ b/apt/methods/ftp.cc @@ -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)