diff --git a/.gitignore b/.gitignore index 2c4f2a9..2cb1e92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ apt-0.5.15lorg3.95.git416.tar.bz2 /apt-0.5.15lorg3.95.git522.tar.bz2 +/apt-1.9.4.tar.gz diff --git a/apt-0.5.15lorg3.2-ppc.patch b/apt-0.5.15lorg3.2-ppc.patch deleted file mode 100644 index 64502ed..0000000 --- a/apt-0.5.15lorg3.2-ppc.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur apt-0.5.15lorg3.2~/buildlib/archtable apt-0.5.15lorg3.2/buildlib/archtable ---- apt-0.5.15lorg3.2~/buildlib/archtable 2006-06-21 18:16:11.000000000 -0400 -+++ apt-0.5.15lorg3.2/buildlib/archtable 2006-10-15 19:22:09.000000000 -0400 -@@ -12,10 +12,10 @@ - alpha.* alpha - m68k m68k - arm.* arm --ppc powerpc --powerpc powerpc --ppc64 powerpc64 --powerpc64 powerpc64 -+ppc ppc -+powerpc ppc -+ppc64 ppc64 -+powerpc64 ppc64 - mipsel mipsel - mipseb mips - mips mips diff --git a/apt-0.5.15lorg3.95-format-security.patch b/apt-0.5.15lorg3.95-format-security.patch deleted file mode 100644 index 470acc3..0000000 --- a/apt-0.5.15lorg3.95-format-security.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up apt-0.5.15lorg3.95.git522/methods/gpg.cc.format-security apt-0.5.15lorg3.95.git522/methods/gpg.cc ---- apt-0.5.15lorg3.95.git522/methods/gpg.cc.format-security 2014-06-03 15:29:27.856287147 -0400 -+++ apt-0.5.15lorg3.95.git522/methods/gpg.cc 2014-06-03 15:29:51.138133879 -0400 -@@ -369,7 +369,7 @@ bool GPGMethod::Fetch(FetchItem *Itm) - if (msg != NULL) - { - removeTmpDir(TempDir, SigCount); -- return _error->Error(msg); -+ return _error->Error("%s", msg); - } - } - else -@@ -393,7 +393,7 @@ bool GPGMethod::Fetch(FetchItem *Itm) - if (msg != NULL) - { - removeTmpDir(TempDir, SigCount); -- return _error->Error(msg); -+ return _error->Error("%s", msg); - } - if (KeyList.empty()) - KeyList = KeyID; diff --git a/apt-0.5.15lorg3.95-gcc47.patch b/apt-0.5.15lorg3.95-gcc47.patch deleted file mode 100644 index 9181763..0000000 --- a/apt-0.5.15lorg3.95-gcc47.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up apt-0.5.15lorg3.95.git522/apt-pkg/contrib/progress.h.gcc47 apt-0.5.15lorg3.95.git522/apt-pkg/contrib/progress.h ---- apt-0.5.15lorg3.95.git522/apt-pkg/contrib/progress.h.gcc47 2012-03-26 12:49:24.841272233 +0300 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/contrib/progress.h 2012-03-26 12:49:34.113245024 +0300 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - using std::string; - using std::map; -diff -up apt-0.5.15lorg3.95.git522/apt-pkg/pkgcache.h.gcc47 apt-0.5.15lorg3.95.git522/apt-pkg/pkgcache.h ---- apt-0.5.15lorg3.95.git522/apt-pkg/pkgcache.h.gcc47 2012-03-26 12:48:54.276361471 +0300 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/pkgcache.h 2012-03-26 12:49:02.107338589 +0300 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include - - using std::string; -diff -up apt-0.5.15lorg3.95.git522/apt-pkg/srcrecords.h.gcc47 apt-0.5.15lorg3.95.git522/apt-pkg/srcrecords.h ---- apt-0.5.15lorg3.95.git522/apt-pkg/srcrecords.h.gcc47 2012-03-26 12:50:02.745161198 +0300 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/srcrecords.h 2012-03-26 12:50:19.495112171 +0300 -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - using std::string; - using std::vector; diff --git a/apt-0.5.15lorg3.95-lua-5.2.patch b/apt-0.5.15lorg3.95-lua-5.2.patch deleted file mode 100644 index da34155..0000000 --- a/apt-0.5.15lorg3.95-lua-5.2.patch +++ /dev/null @@ -1,379 +0,0 @@ ---- apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc.lua-52 2011-04-07 22:18:59.000000000 +0900 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc 2014-05-19 14:21:01.000000000 +0900 -@@ -41,6 +41,18 @@ - - using namespace std; - -+#ifndef lua_pushglobaltable -+#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX) -+#endif -+ -+#ifndef lua_open -+#define lua_open() luaL_newstate() -+#endif -+ -+#ifndef lua_strlen -+#define lua_strlen(L,i) lua_rawlen(L, (i)) -+#endif -+ - #define pushudata(ctype, value) \ - do { \ - ctype *_tmp = (ctype *) lua_newuserdata(L, sizeof(ctype)); \ -@@ -107,14 +119,14 @@ - lua_settop(L, 0); /* discard any results */ - } - #else -- const luaL_reg lualibs[] = { -+ const luaL_Reg lualibs[] = { - {"posix", luaopen_posix}, - {"rex", luaopen_rex}, - {"apt", luaopen_apt}, - {NULL, NULL} - }; - luaL_openlibs(L); -- const luaL_reg *lib = lualibs; -+ const luaL_Reg *lib = lualibs; - for (; lib->name; lib++) { - lua_pushcfunction(L, lib->func); - lua_pushstring(L, lib->name); -@@ -174,14 +186,14 @@ - continue; - if (Value == "interactive") { - lua_pushstring(L, "script_slot"); -- lua_pushstring(L, ConfListKey); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, ConfListKey); - - RunInteractive(ConfListKey); - - lua_pushstring(L, "script_slot"); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, "script_slot"); -+ - continue; - } - if (Value[0] == '.' || Value[0] == '/') { -@@ -213,15 +225,13 @@ - } - - lua_pushstring(L, "script_slot"); -- lua_pushstring(L, ConfListKey); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, ConfListKey); - - InternalRunScript(); - - lua_pushstring(L, "script_slot"); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -- -+ lua_setglobal(L, "script_slot"); - lua_pop(L, 1); - - return true; -@@ -359,7 +369,7 @@ - { - lua_pushstring(L, Name); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -368,7 +378,7 @@ - if (Value != NULL) { - lua_pushstring(L, Name); - lua_pushstring(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - } - Globals.push_back(Name); - } -@@ -378,7 +388,7 @@ - if (Value != NULL) { - lua_pushstring(L, Name); - pushudata(pkgCache::Package*, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - } - Globals.push_back(Name); - } -@@ -393,7 +403,7 @@ - lua_pushstring(L, Value[i]); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -408,7 +418,7 @@ - lua_pushstring(L, Value[i]); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -423,7 +433,7 @@ - lua_pushstring(L, Value[i].c_str()); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -438,7 +448,7 @@ - pushudata(pkgCache::Package*, Value[i]); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -446,7 +456,7 @@ - { - lua_pushstring(L, Name); - lua_pushboolean(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -454,7 +464,7 @@ - { - lua_pushstring(L, Name); - lua_pushnumber(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -463,7 +473,7 @@ - if (Value != NULL) { - lua_pushstring(L, Name); - lua_pushlightuserdata(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - } - Globals.push_back(Name); - } -@@ -472,7 +482,7 @@ - { - lua_pushstring(L, Name); - lua_pushcfunction(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -483,7 +493,7 @@ - I != Globals.end(); I++) { - lua_pushstring(L, I->c_str()); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, I->c_str()); - } - Globals.clear(); - } -@@ -492,7 +502,7 @@ - const char *Lua::GetGlobalStr(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - const char *Ret = NULL; - if (lua_isstring(L, -1)) - Ret = lua_tostring(L, -1); -@@ -504,7 +514,7 @@ - { - vector Ret; - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - int t = lua_gettop(L); - if (lua_istable(L, t)) { - lua_pushnil(L); -@@ -520,8 +530,9 @@ - - double Lua::GetGlobalNum(const char *Name) - { -+ - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - double Ret = 0; - if (lua_isnumber(L, -1)) - Ret = lua_tonumber(L, -1); -@@ -532,7 +543,7 @@ - bool Lua::GetGlobalBool(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - bool Ret = lua_toboolean(L, -1); - lua_remove(L, -1); - return Ret; -@@ -541,7 +552,7 @@ - void *Lua::GetGlobalPtr(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - void *Ret = NULL; - if (lua_isuserdata(L, -1)) - Ret = lua_touserdata(L, -1); -@@ -552,7 +563,7 @@ - pkgCache::Package *Lua::GetGlobalPkg(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - pkgCache::Package *Ret; - checkudata(pkgCache::Package*, Ret, -1); - lua_remove(L, -1); -@@ -563,7 +574,7 @@ - { - vector Ret; - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - int t = lua_gettop(L); - if (lua_istable(L, t)) { - lua_pushnil(L); -@@ -1467,7 +1478,7 @@ - const char *str = luaL_checkstring(L, 1); - if (str != NULL) { - lua_pushliteral(L, "TEXTDOMAIN"); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, "TEXTDOMAIN"); - if (lua_isstring(L, -1)) - lua_pushstring(L, dgettext(lua_tostring(L, -1), str)); - else -@@ -1478,7 +1489,7 @@ - return 0; - } - --static const luaL_reg aptlib[] = { -+static const luaL_Reg aptlib[] = { - {"confget", AptLua_confget}, - {"confgetlist", AptLua_confgetlist}, - {"confset", AptLua_confset}, -@@ -1552,7 +1563,7 @@ - - static int luaopen_apt(lua_State *L) - { -- lua_pushvalue(L, LUA_GLOBALSINDEX); -+ lua_pushglobaltable(L); - luaL_openlib(L, NULL, aptlib, 0); - return 0; - } ---- apt-0.5.15lorg3.95.git522/luaext/lposix.c.lua-52 2011-04-07 22:18:59.000000000 +0900 -+++ apt-0.5.15lorg3.95.git522/luaext/lposix.c 2014-05-16 15:53:51.000000000 +0900 -@@ -49,6 +49,15 @@ - - typedef int (*Selector)(lua_State *L, int i, const void *data); - -+/* implemented as luaL_typerror until lua 5.1, dropped in 5.2 -+ * (C) 1994-2012 Lua.org, PUC-Rio. MIT license -+ */ -+static int typerror (lua_State *L, int narg, const char *tname) { -+ const char *msg = lua_pushfstring(L, "%s expected, got %s", -+ tname, luaL_typename(L, narg)); -+ return luaL_argerror(L, narg, msg); -+} -+ - static int doselection(lua_State *L, int i, const char *const S[], Selector F, const void *data) - { - if (lua_isnone(L, i)) -@@ -135,7 +144,7 @@ - return (p==NULL) ? -1 : p->pw_uid; - } - else -- return luaL_typerror(L, i, "string or number"); -+ return typerror(L, i, "string or number"); - } - - static gid_t mygetgid(lua_State *L, int i) -@@ -150,7 +159,7 @@ - return (g==NULL) ? -1 : g->gr_gid; - } - else -- return luaL_typerror(L, i, "string or number"); -+ return typerror(L, i, "string or number"); - } - - -@@ -554,7 +563,7 @@ - else if (lua_isstring(L, 1)) - p = getpwnam(lua_tostring(L, 1)); - else -- luaL_typerror(L, 1, "string or number"); -+ typerror(L, 1, "string or number"); - if (p==NULL) - lua_pushnil(L); - else -@@ -571,7 +580,7 @@ - else if (lua_isstring(L, 1)) - g = getgrnam(lua_tostring(L, 1)); - else -- luaL_typerror(L, 1, "string or number"); -+ typerror(L, 1, "string or number"); - if (g==NULL) - lua_pushnil(L); - else -@@ -690,10 +699,10 @@ - luaL_buffinit(L, &b); - for (s=luaL_optstring(L, 1, "%s %n %r %v %m"); *s; s++) - if (*s!='%') -- luaL_putchar(&b, *s); -+ luaL_addchar(&b, *s); - else switch (*++s) - { -- case '%': luaL_putchar(&b, *s); break; -+ case '%': luaL_addchar(&b, *s); break; - case 'm': luaL_addstring(&b,u.machine); break; - case 'n': luaL_addstring(&b,u.nodename); break; - case 'r': luaL_addstring(&b,u.release); break; -@@ -792,7 +801,7 @@ - } - - --static const luaL_reg R[] = -+static const luaL_Reg R[] = - { - {"access", Paccess}, - {"chdir", Pchdir}, ---- apt-0.5.15lorg3.95.git522/luaext/lrexlib.c.lua-52 2011-04-07 22:18:59.000000000 +0900 -+++ apt-0.5.15lorg3.95.git522/luaext/lrexlib.c 2014-05-16 15:53:51.000000000 +0900 -@@ -161,7 +161,7 @@ - return 0; - } - --static const luaL_reg posixmeta[] = { -+static const luaL_Reg posixmeta[] = { - {"match", posix_match}, - {"gmatch", posix_gmatch}, - {"__gc", posix_gc}, -@@ -285,7 +285,7 @@ - return 0; - } - --static const luaL_reg pcremeta[] = { -+static const luaL_Reg pcremeta[] = { - {"match", pcre_match}, - {"gmatch", pcre_gmatch}, - {"__gc", pcre_gc}, -@@ -297,7 +297,7 @@ - - /* Open the library */ - --static const luaL_reg rexlib[] = { -+static const luaL_Reg rexlib[] = { - #ifdef WITH_POSIX - {"newPOSIX", posix_comp}, - #endif diff --git a/apt-0.5.15lorg3.95-lua-5.2d.patch b/apt-0.5.15lorg3.95-lua-5.2d.patch deleted file mode 100644 index da34155..0000000 --- a/apt-0.5.15lorg3.95-lua-5.2d.patch +++ /dev/null @@ -1,379 +0,0 @@ ---- apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc.lua-52 2011-04-07 22:18:59.000000000 +0900 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc 2014-05-19 14:21:01.000000000 +0900 -@@ -41,6 +41,18 @@ - - using namespace std; - -+#ifndef lua_pushglobaltable -+#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX) -+#endif -+ -+#ifndef lua_open -+#define lua_open() luaL_newstate() -+#endif -+ -+#ifndef lua_strlen -+#define lua_strlen(L,i) lua_rawlen(L, (i)) -+#endif -+ - #define pushudata(ctype, value) \ - do { \ - ctype *_tmp = (ctype *) lua_newuserdata(L, sizeof(ctype)); \ -@@ -107,14 +119,14 @@ - lua_settop(L, 0); /* discard any results */ - } - #else -- const luaL_reg lualibs[] = { -+ const luaL_Reg lualibs[] = { - {"posix", luaopen_posix}, - {"rex", luaopen_rex}, - {"apt", luaopen_apt}, - {NULL, NULL} - }; - luaL_openlibs(L); -- const luaL_reg *lib = lualibs; -+ const luaL_Reg *lib = lualibs; - for (; lib->name; lib++) { - lua_pushcfunction(L, lib->func); - lua_pushstring(L, lib->name); -@@ -174,14 +186,14 @@ - continue; - if (Value == "interactive") { - lua_pushstring(L, "script_slot"); -- lua_pushstring(L, ConfListKey); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, ConfListKey); - - RunInteractive(ConfListKey); - - lua_pushstring(L, "script_slot"); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, "script_slot"); -+ - continue; - } - if (Value[0] == '.' || Value[0] == '/') { -@@ -213,15 +225,13 @@ - } - - lua_pushstring(L, "script_slot"); -- lua_pushstring(L, ConfListKey); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, ConfListKey); - - InternalRunScript(); - - lua_pushstring(L, "script_slot"); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -- -+ lua_setglobal(L, "script_slot"); - lua_pop(L, 1); - - return true; -@@ -359,7 +369,7 @@ - { - lua_pushstring(L, Name); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -368,7 +378,7 @@ - if (Value != NULL) { - lua_pushstring(L, Name); - lua_pushstring(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - } - Globals.push_back(Name); - } -@@ -378,7 +388,7 @@ - if (Value != NULL) { - lua_pushstring(L, Name); - pushudata(pkgCache::Package*, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - } - Globals.push_back(Name); - } -@@ -393,7 +403,7 @@ - lua_pushstring(L, Value[i]); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -408,7 +418,7 @@ - lua_pushstring(L, Value[i]); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -423,7 +433,7 @@ - lua_pushstring(L, Value[i].c_str()); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -438,7 +448,7 @@ - pushudata(pkgCache::Package*, Value[i]); - lua_rawseti(L, -2, i+1); - } -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -446,7 +456,7 @@ - { - lua_pushstring(L, Name); - lua_pushboolean(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -454,7 +464,7 @@ - { - lua_pushstring(L, Name); - lua_pushnumber(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -463,7 +473,7 @@ - if (Value != NULL) { - lua_pushstring(L, Name); - lua_pushlightuserdata(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - } - Globals.push_back(Name); - } -@@ -472,7 +482,7 @@ - { - lua_pushstring(L, Name); - lua_pushcfunction(L, Value); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, Name); - Globals.push_back(Name); - } - -@@ -483,7 +493,7 @@ - I != Globals.end(); I++) { - lua_pushstring(L, I->c_str()); - lua_pushnil(L); -- lua_rawset(L, LUA_GLOBALSINDEX); -+ lua_setglobal(L, I->c_str()); - } - Globals.clear(); - } -@@ -492,7 +502,7 @@ - const char *Lua::GetGlobalStr(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - const char *Ret = NULL; - if (lua_isstring(L, -1)) - Ret = lua_tostring(L, -1); -@@ -504,7 +514,7 @@ - { - vector Ret; - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - int t = lua_gettop(L); - if (lua_istable(L, t)) { - lua_pushnil(L); -@@ -520,8 +530,9 @@ - - double Lua::GetGlobalNum(const char *Name) - { -+ - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - double Ret = 0; - if (lua_isnumber(L, -1)) - Ret = lua_tonumber(L, -1); -@@ -532,7 +543,7 @@ - bool Lua::GetGlobalBool(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - bool Ret = lua_toboolean(L, -1); - lua_remove(L, -1); - return Ret; -@@ -541,7 +552,7 @@ - void *Lua::GetGlobalPtr(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - void *Ret = NULL; - if (lua_isuserdata(L, -1)) - Ret = lua_touserdata(L, -1); -@@ -552,7 +563,7 @@ - pkgCache::Package *Lua::GetGlobalPkg(const char *Name) - { - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - pkgCache::Package *Ret; - checkudata(pkgCache::Package*, Ret, -1); - lua_remove(L, -1); -@@ -563,7 +574,7 @@ - { - vector Ret; - lua_pushstring(L, Name); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, Name); - int t = lua_gettop(L); - if (lua_istable(L, t)) { - lua_pushnil(L); -@@ -1467,7 +1478,7 @@ - const char *str = luaL_checkstring(L, 1); - if (str != NULL) { - lua_pushliteral(L, "TEXTDOMAIN"); -- lua_rawget(L, LUA_GLOBALSINDEX); -+ lua_getglobal(L, "TEXTDOMAIN"); - if (lua_isstring(L, -1)) - lua_pushstring(L, dgettext(lua_tostring(L, -1), str)); - else -@@ -1478,7 +1489,7 @@ - return 0; - } - --static const luaL_reg aptlib[] = { -+static const luaL_Reg aptlib[] = { - {"confget", AptLua_confget}, - {"confgetlist", AptLua_confgetlist}, - {"confset", AptLua_confset}, -@@ -1552,7 +1563,7 @@ - - static int luaopen_apt(lua_State *L) - { -- lua_pushvalue(L, LUA_GLOBALSINDEX); -+ lua_pushglobaltable(L); - luaL_openlib(L, NULL, aptlib, 0); - return 0; - } ---- apt-0.5.15lorg3.95.git522/luaext/lposix.c.lua-52 2011-04-07 22:18:59.000000000 +0900 -+++ apt-0.5.15lorg3.95.git522/luaext/lposix.c 2014-05-16 15:53:51.000000000 +0900 -@@ -49,6 +49,15 @@ - - typedef int (*Selector)(lua_State *L, int i, const void *data); - -+/* implemented as luaL_typerror until lua 5.1, dropped in 5.2 -+ * (C) 1994-2012 Lua.org, PUC-Rio. MIT license -+ */ -+static int typerror (lua_State *L, int narg, const char *tname) { -+ const char *msg = lua_pushfstring(L, "%s expected, got %s", -+ tname, luaL_typename(L, narg)); -+ return luaL_argerror(L, narg, msg); -+} -+ - static int doselection(lua_State *L, int i, const char *const S[], Selector F, const void *data) - { - if (lua_isnone(L, i)) -@@ -135,7 +144,7 @@ - return (p==NULL) ? -1 : p->pw_uid; - } - else -- return luaL_typerror(L, i, "string or number"); -+ return typerror(L, i, "string or number"); - } - - static gid_t mygetgid(lua_State *L, int i) -@@ -150,7 +159,7 @@ - return (g==NULL) ? -1 : g->gr_gid; - } - else -- return luaL_typerror(L, i, "string or number"); -+ return typerror(L, i, "string or number"); - } - - -@@ -554,7 +563,7 @@ - else if (lua_isstring(L, 1)) - p = getpwnam(lua_tostring(L, 1)); - else -- luaL_typerror(L, 1, "string or number"); -+ typerror(L, 1, "string or number"); - if (p==NULL) - lua_pushnil(L); - else -@@ -571,7 +580,7 @@ - else if (lua_isstring(L, 1)) - g = getgrnam(lua_tostring(L, 1)); - else -- luaL_typerror(L, 1, "string or number"); -+ typerror(L, 1, "string or number"); - if (g==NULL) - lua_pushnil(L); - else -@@ -690,10 +699,10 @@ - luaL_buffinit(L, &b); - for (s=luaL_optstring(L, 1, "%s %n %r %v %m"); *s; s++) - if (*s!='%') -- luaL_putchar(&b, *s); -+ luaL_addchar(&b, *s); - else switch (*++s) - { -- case '%': luaL_putchar(&b, *s); break; -+ case '%': luaL_addchar(&b, *s); break; - case 'm': luaL_addstring(&b,u.machine); break; - case 'n': luaL_addstring(&b,u.nodename); break; - case 'r': luaL_addstring(&b,u.release); break; -@@ -792,7 +801,7 @@ - } - - --static const luaL_reg R[] = -+static const luaL_Reg R[] = - { - {"access", Paccess}, - {"chdir", Pchdir}, ---- apt-0.5.15lorg3.95.git522/luaext/lrexlib.c.lua-52 2011-04-07 22:18:59.000000000 +0900 -+++ apt-0.5.15lorg3.95.git522/luaext/lrexlib.c 2014-05-16 15:53:51.000000000 +0900 -@@ -161,7 +161,7 @@ - return 0; - } - --static const luaL_reg posixmeta[] = { -+static const luaL_Reg posixmeta[] = { - {"match", posix_match}, - {"gmatch", posix_gmatch}, - {"__gc", posix_gc}, -@@ -285,7 +285,7 @@ - return 0; - } - --static const luaL_reg pcremeta[] = { -+static const luaL_Reg pcremeta[] = { - {"match", pcre_match}, - {"gmatch", pcre_gmatch}, - {"__gc", pcre_gc}, -@@ -297,7 +297,7 @@ - - /* Open the library */ - --static const luaL_reg rexlib[] = { -+static const luaL_Reg rexlib[] = { - #ifdef WITH_POSIX - {"newPOSIX", posix_comp}, - #endif diff --git a/apt-0.5.15lorg3.95-lua-5.3.patch b/apt-0.5.15lorg3.95-lua-5.3.patch deleted file mode 100644 index 7332f23..0000000 --- a/apt-0.5.15lorg3.95-lua-5.3.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc.lua-53 apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc ---- apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc.lua-53 2015-01-15 11:36:22.548854851 -0500 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/luaiface.cc 2015-01-15 11:36:31.492806064 -0500 -@@ -837,7 +837,7 @@ static int AptLua_confset(lua_State *L) - if (lua_gettop(L) >= 3 && lua_isboolean(L, 3)) - cnd = lua_toboolean(L, 3); - else -- cnd = luaL_optint(L, 3, 0); -+ cnd = luaL_optinteger(L, 3, 0); - if (key != NULL && val != NULL) { - if (cnd != 0) - _config->CndSet(key, val); -diff -up apt-0.5.15lorg3.95.git522/luaext/lposix.c.lua-53 apt-0.5.15lorg3.95.git522/luaext/lposix.c ---- apt-0.5.15lorg3.95.git522/luaext/lposix.c.lua-53 2015-01-15 11:34:08.660585176 -0500 -+++ apt-0.5.15lorg3.95.git522/luaext/lposix.c 2015-01-15 11:35:40.740082906 -0500 -@@ -348,22 +348,22 @@ static int Pfork(lua_State *L) /** for - - static int Pwait(lua_State *L) /** wait([pid]) */ - { -- pid_t pid = luaL_optint(L, 1, -1); -+ pid_t pid = luaL_optinteger(L, 1, -1); - return pushresult(L, waitpid(pid, NULL, 0), NULL); - } - - - static int Pkill(lua_State *L) /** kill(pid,[sig]) */ - { -- pid_t pid = luaL_checkint(L, 1); -- int sig = luaL_optint(L, 2, SIGTERM); -+ pid_t pid = luaL_checkinteger(L, 1); -+ int sig = luaL_optinteger(L, 2, SIGTERM); - return pushresult(L, kill(pid, sig), NULL); - } - - - static int Psleep(lua_State *L) /** sleep(seconds) */ - { -- unsigned int seconds = luaL_checkint(L, 1); -+ unsigned int seconds = luaL_checkinteger(L, 1); - lua_pushnumber(L, sleep(seconds)); - return 1; - } -@@ -510,7 +510,7 @@ static int Pgetprocessid(lua_State *L) - - static int Pttyname(lua_State *L) /** ttyname(fd) */ - { -- int fd=luaL_optint(L, 1, 0); -+ int fd=luaL_optinteger(L, 1, 0); - lua_pushstring(L, ttyname(fd)); - return 1; - } diff --git a/apt-0.5.15lorg3.95-rpm-suggest-fix.patch b/apt-0.5.15lorg3.95-rpm-suggest-fix.patch deleted file mode 100644 index ef6cbaa..0000000 --- a/apt-0.5.15lorg3.95-rpm-suggest-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up apt-0.5.15lorg3.95.git522/apt-pkg/rpm/rpmhandler.cc.rpm-suggest-fix apt-0.5.15lorg3.95.git522/apt-pkg/rpm/rpmhandler.cc ---- apt-0.5.15lorg3.95.git522/apt-pkg/rpm/rpmhandler.cc.rpm-suggest-fix 2014-12-10 16:36:41.522839504 -0500 -+++ apt-0.5.15lorg3.95.git522/apt-pkg/rpm/rpmhandler.cc 2014-12-10 16:36:47.730798300 -0500 -@@ -206,7 +206,7 @@ bool RPMHdrHandler::PRCO(unsigned int Ty - deptype = RPMTAG_PROVIDENAME; - break; - case pkgCache::Dep::Suggests: -- deptype = RPMTAG_SUGGESTSNAME; -+ deptype = RPMTAG_SUGGESTNAME; - break; - #if 0 // Enhances dep type is not even known to apt, sigh.. - case pkgCache::Dep::Enhances: diff --git a/apt-0.5.15lorg3.x-cache-corruption.patch b/apt-0.5.15lorg3.x-cache-corruption.patch deleted file mode 100644 index 9d26024..0000000 --- a/apt-0.5.15lorg3.x-cache-corruption.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: apt-pkg/pkgcachegen.cc -=================================================================== ---- apt-pkg/pkgcachegen.cc (revision 272) -+++ apt-pkg/pkgcachegen.cc (working copy) -@@ -650,6 +650,17 @@ - continue; - } - -+ // Band-aid for cache corruption issue (RH bugzilla #211254) -+ // until real cause and cure is found -+ for (pkgCache::PkgFileIterator File = Cache.FileBegin(); -+ File.end() == false; File++) { -+ if (File.FileName() == NULL) { -+ _error->Warning(_("Cache corruption detected, band-aid applied.")); -+ _error->Warning(_("See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=211254 for further info.")); -+ return false; -+ } -+ } -+ - // FindInCache is also expected to do an IMS check. - pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache); - if (File.end() == true) diff --git a/apt.conf b/apt.conf deleted file mode 100644 index 88e5c23..0000000 --- a/apt.conf +++ /dev/null @@ -1,20 +0,0 @@ -// User customizable configuration - -RPM -{ - // Uncomment to disable GPG-signature checking for packages - // GPG-Check "false"; - // Uncomment to prevent kernel being handled along with (dist-)upgrade - // Upgrade-Virtual "false"; - // Uncomment to hold packages with modified config files in (dist-)upgrade - // Preserve-Config "true"; -}; - -// Options for the downloading routines -Acquire -{ - // Retries "1"; - // http::Proxy "http://user:password@proxy-server.domain.tld:port/"; - // http::Proxy "http://proxy-server.domain.tld:port/"; -}; - diff --git a/apt.service b/apt.service deleted file mode 100644 index c5d74bc..0000000 --- a/apt.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=APT automatic updates. -After=syslog.target - -[Service] -Type=oneshot -EnvironmentFile=-/etc/sysconfig/apt -ExecStart=/bin/touch /var/lock/subsys/apt -ExecStop=/bin/rm -f /var/lock/subsys/apt -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/apt.spec b/apt.spec index 48682fd..87010b0 100644 --- a/apt.spec +++ b/apt.spec @@ -1,725 +1,311 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%define generate_rpmpriorities 0 -%define comps %{_datadir}/comps/%{_build_arch}/comps.xml - -%define aptver 0.5.15lorg3.95 -%define snapver git522 -%define srcver %{aptver}.%{snapver} - -# This is disabled because -# A) it is broken and bitrotten -# B) fixing it involves swig and ain't no one got time for that -%global with_python 0 - -Summary: Debian's Advanced Packaging Tool with RPM support -Name: apt -Version: %{aptver} -Release: 38.%{snapver}%{?dist} -URL: http://apt-rpm.org/ -# SourceLicense: GPLv2+ except lua/ which is MIT -License: GPLv2+ - -#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2 -Source0: http://apt-rpm.org/testing/%{name}-%{srcver}.tar.bz2 - -# user editable template configs -Source1: apt.conf -Source2: sources.list -Source3: vendors.list -Source4: apt_preferences - -# rpmpriorities generated + manually tweaked from comps.xml core group -Source5: rpmpriorities -Source19: comps2prio.xsl - -# Sources 50-99 are for Lua-scripts not in contrib/ -Source51: upgradevirt.lua -Source52: gpg-check.lua - -# 150-199 for apt.conf.d -# "factory defaults" -Source150: default.conf - -Source200: apt.service - -# Fix ppc mapping -Patch0: apt-0.5.15lorg3.2-ppc.patch -# band aid for mmap issues (#211254) -Patch1: apt-0.5.15lorg3.x-cache-corruption.patch -# fix build with gcc 4.7 -Patch2: apt-0.5.15lorg3.95-gcc47.patch -# fix build with lua 5.2 -Patch3: apt-0.5.15lorg3.95-lua-5.2d.patch -# fix format-security issue -Patch4: apt-0.5.15lorg3.95-format-security.patch -# Fix to build against modern rpm -Patch5: apt-0.5.15lorg3.95-rpm-suggest-fix.patch -%if 0%{?fedora} > 21 -# Fix for lua 5.3 -Patch6: apt-0.5.15lorg3.95-lua-5.3.patch -%endif +%{!?jobs:%global jobs %(/usr/bin/getconf _NPROCESSORS_ONLN)} -# TODO: verify the required minimum Python version -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: python2-devel >= 2.2 -BuildRequires: swig -BuildRequires: libxml2-devel -BuildRequires: sqlite-devel -BuildRequires: rpm-devel -BuildRequires: zlib-devel -BuildRequires: bzip2-devel -BuildRequires: libstdc++-devel -BuildRequires: gettext -BuildRequires: perl-interpreter -BuildRequires: readline-devel -BuildRequires: ncurses-devel -BuildRequires: gawk -%if %{generate_rpmpriorities} -BuildRequires: %{_bindir}/xsltproc -BuildRequires: %{comps} -%endif -# libxml2-devel, #183689 -BuildRequires: pkgconfig -%if 0%{?fedora} <= 21 -BuildRequires: lua-devel >= 5.1 -%else -BuildRequires: lua-devel >= 5.3 -%endif -BuildRequires: systemd-units -Requires: gnupg -Requires: bzip2 -Requires: system-release >= 4 -Requires(post): systemd-sysv -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -%if 0%{!?_with_groupinstall:1} -Obsoletes: %{name}-plugins-groupinstall < %{version}-%{release} -%endif -%if 0%{?_without_list:1} -Obsoletes: %{name}-plugins-list < %{version}-%{release} -%endif -%if 0%{?_without_log:1} -Obsoletes: %{name}-plugins-log < %{version}-%{release} -%endif -Requires: apt-config +# apt unstable library somajor... +%global libsomajor 5.90 +%global libprivsomajor 0.0 -%description -APT-RPM is a port of Debian's apt tools for RPM based distributions. -It provides the apt-get utility that provides a simple, safe way to -install and upgrade packages. APT features complete installation -ordering, multiple source capability and several other useful -features. +# Disable integration tests by default, +# as there is a bunch of failures on non-Debian systems currently. +# Additionally, these tests take a long time to run. +%bcond_with check_integration -%package devel -Summary: Development files and documentation for APT's libapt-pkg -Requires: %{name} = %{version}-%{release} -Requires: rpm-devel -Requires: pkgconfig - -%description devel -This package contains development files for developing with APT's -libapt-pkg package manipulation library, modified for RPM. - -%package python -Summary: Python bindings for libapt-pkg -Requires: %{name} = %{version}-%{release} - -%description python -The apt-python package contains a module which allows python programs -to access the APT library interface. - -%package plugins-groupinstall -Summary: Additional commands to install and remove package groups -Requires: %{name} = %{version}-%{release} -Requires: rhpl -Requires: comps - -%description plugins-groupinstall -This package adds four new commands to apt for installing, removing -and viewing groups of packages: -apt-cache groupnames -apt-cache showgroup [ ..] -apt-get groupinstall [ ..] -apt-get groupremove [ ..] - -The group information is retrieved from comps.xml used by anaconda -(the system installer) and other package management tools of -RHL/RHEL/FC distributions. - -%package plugins-list -Summary: Additional commands to list extra packages and leaves -Requires: %{name} = %{version}-%{release} - -%description plugins-list -This package adds commands for listing all installed packages which -are not availabe in any online repository, and packages that are not -required by any other installed package: -apt-cache list-extras -apt-cache list-nodeps - -%package plugins-log -Summary: Log the changes being introduced by the transaction -Requires: %{name} = %{version}-%{release} - -%description plugins-log -This script will log the changes being introduced by -the transaction which is going to be run, and is based -on an idea of Panu Matilainen. - -When some transaction is run, it will dump information -about it in /var/log/apt.log, or in the configured file. +Name: apt +Version: 1.9.4 +Release: 1%{?dist} +Summary: Command-line package manager for Debian packages +License: GPLv2+ +URL: https://tracker.debian.org/pkg/apt +Source0: https://salsa.debian.org/apt-team/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz -%prep -%setup -q -n %{name}-%{srcver} -%patch0 -p1 -b .ppc -%patch1 -p0 -b .mmap -%patch2 -p1 -b .gcc47 -%patch3 -p1 -b .lua-52 -%patch4 -p1 -b .format-security -%patch5 -p1 -b .rpm-suggest-fix -%if 0%{?fedora} > 21 -%patch6 -p1 -b .lua-53 +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.4 +BuildRequires: ninja-build + +BuildRequires: pkgconfig(gnutls) >= 3.4.6 +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(libudev) + +# Package manager BRs +BuildRequires: dpkg-dev + +# These BRs lack pkgconfig() names +BuildRequires: libdb-devel +BuildRequires: gtest-devel +BuildRequires: bzip2-devel + +# Misc BRs +BuildRequires: triehash +BuildRequires: po4a >= 0.35 +BuildRequires: docbook-style-xsl, docbook-dtds +BuildRequires: gettext >= 0.19 +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: w3m +BuildRequires: %{_bindir}/xsltproc + +%if %{with check_integration} +BuildRequires: coreutils, moreutils, +BuildRequires: moreutils-parallel +BuildRequires: fakeroot, lsof, sed +BuildRequires: tar, wget, stunnel +BuildRequires: gnupg, gnupg2 +BuildRequires: perl(File::FcntlLock) +BuildRequires: perl(Digest::SHA) +BuildRequires: debhelper >= 9 +# Unbreak running tests in non-interactive terminals +BuildRequires: expect %endif -install -pm 644 %{SOURCE19} comps2prio.xsl +# For ensuring the user is created +Requires(pre): shadow-utils -# don't require python, lua etc because of stuff in doc/contrib -find contrib/ -type f | xargs chmod 0644 +# Apt is essentially broken without dpkg +Requires: dpkg >= 1.17.14 -# add aarch64 into archtable -echo "aarch64 aarch64" >>buildlib/archtable -# add ppc64le into archtable -echo "powerpc64le ppc64le" >>buildlib/archtable +# To ensure matching apt libs are installed +Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%build -%if 0%{?fedora} > 21 -CXXFLAGS="%{optflags} -DLUA_COMPAT_MODULE" -%endif -%configure --disable-dependency-tracking --disable-static +# apt-transport-curl-https is gone... +Provides: %{name}-transport-https = %{version}-%{release} +Provides: %{name}-transport-curl-https = %{version}-%{release} -make %{?_smp_mflags} +%description +This package provides commandline tools for searching and +managing as well as querying information about packages +as a low-level access to all features of the libapt-pkg library. + +These include: + * apt-get for retrieval of packages and information about them + from authenticated sources and for installation, upgrade and + removal of packages together with their dependencies + * apt-cache for querying available information about installed + as well as installable packages + * apt-cdrom to use removable media as a source for packages + * apt-config as an interface to the configuration settings + * apt-key as an interface to manage authentication keys + +%package libs +Summary: Runtime libraries for %{name} + +%description libs +This package includes the libapt-pkg library. + +libapt-pkg provides the common functionality for searching and +managing packages as well as information about packages. +Higher-level package managers can depend upon this library. + +This includes: + * retrieval of information about packages from multiple sources + * retrieval of packages and all dependent packages + needed to satisfy a request either through an internal + solver or by interfacing with an external one + * authenticating the sources and validating the retrieved data + * installation and removal of packages in the system + * providing different transports to retrieve data over cdrom, ftp, + http, rsh as well as an interface to add more transports like + debtorrent (apt-transport-debtorrent). + +%package doc +Summary: Documentation for APT +BuildArch: noarch + +%description doc +This package contains the user guide and offline guide for various +APT tools which are provided in a html and a text-only version. -%if 0%{?with_python} -make -C python %{?_smp_mflags} PYTHON="%{__python}" -python -O -c "import py_compile; py_compile.compile('python/apt.py')" -%endif +%package devel +Summary: Development files for APT's libraries +Provides: libapt-pkg-devel%{?_isa} = %{version}-%{release} +Provides: libapt-pkg-devel = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} -cp -p %{SOURCE5} rpmpriorities -%if %{generate_rpmpriorities} -xsltproc -o rpmpriorities comps2prio.xsl %{comps} -%endif +%description devel +This package contains the header files and libraries for +developing with APT's libapt-pkg Debian package manipulation +library. +%package devel-doc +Summary: Documentation for developing against APT libraries +Provides: libapt-pkg-doc = %{version}-%{release} +BuildArch: noarch -%install -make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg -%find_lang %{name} +%description devel-doc +This package contains documentation for development of the APT +Debian package manipulation program and its libraries. -# The state files -mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial -mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist -mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist -mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial - -# The config files -mkdir -p %{buildroot}%{_sysconfdir}/apt -mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d -mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d -mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d -install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf -install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list -install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list -install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences -install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/ - -# install config parts -install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/ - -# Lua scripts -mkdir -p %{buildroot}%{_datadir}/apt/scripts -for script in %{SOURCE51} %{SOURCE52} ; do - install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts -done - -%if 0%{?with_python} -# The python bindings -mkdir -p %{buildroot}%{python_sitearch}/ -install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/ -install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/ -touch %{buildroot}%{python_sitearch}/apt.pyo -%endif +This includes the source code documentation generated by doxygen +in html format. -# Nightly updater scripts & default config -mkdir -p %{buildroot}%{_unitdir} -install -Dpm 644 %{SOURCE200} %{buildroot}%{_unitdir}/apt.service -install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron -install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt - -# apt-plugins-groupinstall from contrib -%if 0%{?_with_groupinstall:1} -install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts -touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o} -install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \ - %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/ -%endif +%package utils +Summary: Package management related utility programs +Requires: %{name}%{?_isa} = %{version}-%{release} -# apt-plugins-list from contrib -%if 0%{!?_without_list:1} -install -pm 755 contrib/list-extras/list-extras.lua %{buildroot}/%{_datadir}/apt/scripts -install -pm 644 contrib/list-extras/list-extras.conf %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/ -install -pm 755 contrib/list-nodeps/list-nodeps.lua %{buildroot}/%{_datadir}/apt/scripts -install -pm 644 contrib/list-nodeps/list-nodeps.conf %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/ -%endif +%description utils +This package contains some less used commandline utilities related +to package management with APT. -# apt-plugins-log from contrib -%if 0%{!?_without_log:1} -install -pm 755 contrib/log/log.lua %{buildroot}/%{_datadir}/apt/scripts -install -pm 644 contrib/log/log.conf %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/ -%endif + * apt-extracttemplates is used by debconf to prompt for configuration + questions before installation. + * apt-ftparchive is used to create Packages and other index files + needed to publish an archive of Debian packages + * apt-sortpkgs is a Packages/Sources file normalizer. -# nuke .la files -rm -f %{buildroot}%{_libdir}/*.la +%prep +%autosetup -p1 -%post -%systemd_post apt.service -/sbin/ldconfig +%build +# Do out of tree build +mkdir %{_target_platform} +pushd %{_target_platform} +%cmake .. -GNinja +popd +%ninja_build -C %{_target_platform} -%preun -%systemd_preun apt.service +%install +%ninja_install -C %{_target_platform} -%postun -%systemd_postun_with_restart apt.service -/sbin/ldconfig +%find_lang %{name} +%find_lang %{name}-utils +%find_lang libapt-pkg%{libsomajor} + +cat libapt*.lang >> %{name}-libs.lang + +mkdir -p %{buildroot}%{_localstatedir}/log/apt +touch %{buildroot}%{_localstatedir}/log/apt/{term,history}.log +mkdir -p %{buildroot}%{_sysconfdir}/apt/{apt.conf,preferences,sources.list,trusted.gpg}.d +install -pm 644 doc/examples/apt.conf %{buildroot}%{_sysconfdir}/apt/ +touch %{buildroot}%{_sysconfdir}/apt/sources.list +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +cat > %{buildroot}%{_sysconfdir}/logrotate.d/apt </dev/null 2>&1 ||: +# Create the _apt user+group for apt data +%pre +getent group _apt >/dev/null || groupadd -r _apt +getent passwd _apt >/dev/null || \ + useradd -r -g _apt -d %{_sharedstatedir}/apt -s /sbin/nologin \ + -c "APT account for owning persistent & cache data" _apt +exit 0 -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del apt >/dev/null 2>&1 || : -/bin/systemctl try-restart apt.service >/dev/null 2>&1 || : +%ldconfig_scriptlets libs %files -f %{name}.lang -%doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/ -%doc ChangeLog - -%dir %{_sysconfdir}/apt/ -%config(noreplace) %{_sysconfdir}/apt/apt.conf -%config(noreplace) %{_sysconfdir}/apt/preferences -%config(noreplace) %{_sysconfdir}/apt/rpmpriorities -%config(noreplace) %{_sysconfdir}/apt/sources.list -%config(noreplace) %{_sysconfdir}/apt/vendors.list -%dir %{_sysconfdir}/apt/apt.conf.d/ -# NOTE: no noreplace because we WANT to be able to change the defaults -# without user intervention! -%config %{_sysconfdir}/apt/apt.conf.d/default.conf -%config %{_sysconfdir}/apt/apt.conf.d/multilib.conf -%dir %{_sysconfdir}/apt/sources.list.d/ -%dir %{_sysconfdir}/apt/vendors.list.d/ - -%config(noreplace) %{_sysconfdir}/sysconfig/apt -%{_sysconfdir}/cron.daily/apt.cron - -%{_unitdir}/apt.service - +%license COPYING* +%doc README.* AUTHORS +%{_bindir}/apt %{_bindir}/apt-cache %{_bindir}/apt-cdrom %{_bindir}/apt-config -%{_bindir}/apt-shell %{_bindir}/apt-get -%{_bindir}/countpkglist -%{_bindir}/genpkglist -%{_bindir}/gensrclist -%{_bindir}/genbasedir -%{_libdir}/libapt-pkg*.so.* -%{_libdir}/apt/ -%dir %{_datadir}/apt/ -%dir %{_datadir}/apt/scripts/ -%{_datadir}/apt/scripts/gpg-check.lua -%{_datadir}/apt/scripts/upgradevirt.lua -%{_localstatedir}/cache/apt/ -%{_localstatedir}/lib/apt/ -%{_mandir}/man[58]/*.[58]* +%{_bindir}/apt-key +%{_bindir}/apt-mark +%dir %{_libexecdir}/apt +%{_libexecdir}/apt/apt-helper +%{_libexecdir}/apt/methods +%{_libexecdir}/dpkg/methods/apt +%attr(-,_apt,_apt) %{_sharedstatedir}/apt +%attr(-,_apt,_apt) %{_localstatedir}/cache/apt +%dir %attr(-,_apt,_apt) %{_localstatedir}/log/apt +%ghost %{_localstatedir}/log/apt/history.log +%ghost %{_localstatedir}/log/apt/term.log +%dir %attr(-,_apt,_apt) %{_sysconfdir}/apt/apt.conf.d +%dir %attr(-,_apt,_apt) %{_sysconfdir}/apt/preferences.d +%dir %attr(-,_apt,_apt) %{_sysconfdir}/apt/sources.list.d +%dir %attr(-,_apt,_apt) %{_sysconfdir}/apt/trusted.gpg.d +%config(noreplace) %attr(-,_apt,_apt) %{_sysconfdir}/apt/apt.conf +%ghost %{_sysconfdir}/apt/sources.list +%config(noreplace) %{_sysconfdir}/logrotate.d/apt +%{_datadir}/bash-completion/completions/apt +%{_mandir}/*/*/apt.* +%{_mandir}/*/*/apt-cache.* +%{_mandir}/*/*/apt-cdrom.* +%{_mandir}/*/*/apt-config.* +%{_mandir}/*/*/apt-get.* +%{_mandir}/*/*/apt-key.* +%{_mandir}/*/*/apt-mark.* +%{_mandir}/*/*/apt-secure.* +%{_mandir}/*/*/apt-transport-http.* +%{_mandir}/*/*/apt-transport-https.* +%{_mandir}/*/*/apt-transport-mirror.* +%{_mandir}/*/*/apt_auth.* +%{_mandir}/*/*/apt_preferences.* +%{_mandir}/*/*/sources.list.* +%{_mandir}/*/apt.* +%{_mandir}/*/apt-cache.* +%{_mandir}/*/apt-cdrom.* +%{_mandir}/*/apt-config.* +%{_mandir}/*/apt-get.* +%{_mandir}/*/apt-key.* +%{_mandir}/*/apt-mark.* +%{_mandir}/*/apt-patterns.* +%{_mandir}/*/apt-secure.* +%{_mandir}/*/apt-transport-http.* +%{_mandir}/*/apt-transport-https.* +%{_mandir}/*/apt-transport-mirror.* +%{_mandir}/*/apt_auth.* +%{_mandir}/*/apt_preferences.* +%{_mandir}/*/sources.list.* +%doc %{_docdir}/%{name} + +%files libs -f %{name}-libs.lang +%license COPYING* +%{_libdir}/libapt-pkg.so.%{libsomajor}{,.*} +%{_libdir}/libapt-private.so.%{libprivsomajor}{,.*} + +%files doc +%doc %{_docdir}/%{name}-doc + +%files devel-doc +%doc %{_docdir}/libapt-pkg-doc %files devel -%{_includedir}/apt-pkg/ -%{_libdir}/libapt-pkg*.so -%{_libdir}/pkgconfig/libapt-pkg.pc - -%if 0%{?with_python} -%files python -%{python2_sitearch}/_apt.so -%{python2_sitearch}/apt.py* -%endif - -%if 0%{?_with_groupinstall:1} -%files plugins-groupinstall -# XXX not config? -%{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf -%{_datadir}/apt/scripts/apt-groupinstall.lua -%{_datadir}/apt/scripts/groupinstall-backend-comps.py -%ghost %{_datadir}/apt/scripts/groupinstall-backend-comps.py[co] -%endif - -%if 0%{!?_without_list:1} -%files plugins-list -%config %{_sysconfdir}/apt/apt.conf.d/list-extras.conf -%config %{_sysconfdir}/apt/apt.conf.d/list-nodeps.conf -%{_datadir}/apt/scripts/list-extras.lua -%{_datadir}/apt/scripts/list-nodeps.lua -%endif - -%if 0%{!?_without_log:1} -%files plugins-log -%config %{_sysconfdir}/apt/apt.conf.d/log.conf -%{_datadir}/apt/scripts/log.lua -%endif - +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc +%{_includedir}/* + +%files utils -f %{name}-utils.lang +%{_bindir}/apt-extracttemplates +%{_bindir}/apt-ftparchive +%{_bindir}/apt-sortpkgs +%{_libexecdir}/apt/planners +%{_libexecdir}/apt/solvers +%{_mandir}/*/*/apt-extracttemplates.* +%{_mandir}/*/*/apt-ftparchive.* +%{_mandir}/*/*/apt-sortpkgs.* +%{_mandir}/*/apt-extracttemplates.* +%{_mandir}/*/apt-ftparchive.* +%{_mandir}/*/apt-sortpkgs.* +%doc %{_docdir}/%{name}-utils %changelog -* Wed Jul 24 2019 Fedora Release Engineering - 0.5.15lorg3.95-38.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 10 22:13:17 CET 2019 Igor Gnatenko - 0.5.15lorg3.95-37.git522 -- Rebuild for RPM 4.15 - -* Mon Jun 10 15:42:00 CET 2019 Igor Gnatenko - 0.5.15lorg3.95-36.git522 -- Rebuild for RPM 4.15 - -* Sun Feb 17 2019 Igor Gnatenko - 0.5.15lorg3.95-35.git522 -- Rebuild for readline 8.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.5.15lorg3.95-34.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.5.15lorg3.95-33.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 14 2018 Iryna Shcherbina - 0.5.15lorg3.95-32.git522 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 0.5.15lorg3.95-31.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Aug 11 2017 Igor Gnatenko - 0.5.15lorg3.95-30.git522 -- Rebuilt after RPM update (№ 3) - -* Thu Aug 10 2017 Igor Gnatenko - 0.5.15lorg3.95-29.git522 -- Rebuilt for RPM soname bump - -* Thu Aug 10 2017 Igor Gnatenko - 0.5.15lorg3.95-28.git522 -- Rebuilt for RPM soname bump - -* Wed Aug 02 2017 Fedora Release Engineering - 0.5.15lorg3.95-27.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.5.15lorg3.95-26.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.5.15lorg3.95-25.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 12 2017 Igor Gnatenko - 0.5.15lorg3.95-24.git522 -- Rebuild for readline 7.x - -* Wed Feb 03 2016 Fedora Release Engineering - 0.5.15lorg3.95-23.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Oct 22 2015 Marcin Juszkiewicz - 0.5.15lorg3.95-22.git522 -- Add ppc64le support - -* Wed Jul 29 2015 Zbigniew Jędrzejewski-Szmek - 0.5.15lorg3.95-21.git522 -- Rebuilt for librpm - -* Tue Jul 14 2015 Marcin Juszkiewicz - 0.5.15lorg3.95-20.git522 -- Add AArch64 support - -* Wed Jun 17 2015 Fedora Release Engineering - 0.5.15lorg3.95-19.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.5.15lorg3.95-18.git522 -- Rebuilt for GCC 5 C++11 ABI change - -* Wed Mar 11 2015 Mosaab Alzoubi - 0.5.15lorg3.95-17.git522 -- Accept Vaclav Pavlin patch #850028 -- Support F21 with old lua -- Set apt.service attr to 644 #1158853 - -* Wed Mar 11 2015 Václav Pavlín - 0.5.15lorg3.95-16.git522 -- Scriptlets replaced with new systemd macros (#850028) - -* Thu Jan 15 2015 Tom Callaway - 0.5.15lorg3.95-15.git522 -- add lua 5.3 support - -* Wed Dec 10 2014 Tom Callaway - 0.5.15lorg3.95-14.git522 -- fix lua patch again -- fix build with modern RPM -- disable python support (it is bitrotten and broken) - -* Fri Aug 15 2014 Fedora Release Engineering - 0.5.15lorg3.95-13.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.15lorg3.95-12.git522 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 3 2014 Tom Callaway - 0.5.14lorg3.95-11.git522 -- fix format-security issues - -* Tue May 20 2014 Tom Callaway - 0.5.14lorg3.95-10.git522.1 -- updated lua fix - -* Sat Aug 03 2013 Fedora Release Engineering - 0.5.15lorg3.95-9.git522.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 10 2013 Tom Callaway - 0.5.14lorg3.95-8.git522.1 -- fix for new lua - -* Wed Feb 13 2013 Fedora Release Engineering - 0.5.15lorg3.95-7.git522.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 0.5.15lorg3.95-6.git522.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Mar 26 2012 Panu Matilainen - 0.5.15lorg3.95-6.git52 2.1 -- fix build with gcc 4.7 - -* Tue Mar 20 2012 Panu Matilainen - 0.5.15lorg3.95-5.git522.1 -- rebuild for new rpm - -* Tue Feb 28 2012 Fedora Release Engineering - 0.5.15lorg3.95-4.git522.1 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 Fedora Release Engineering - 0.5.15lorg3.95-3.git522.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Sep 9 2011 Tom Callaway - 0.5.15lorg3.95-2.git522.1 -- add missing systemd scriptlets - -* Fri Sep 9 2011 Tom Callaway - 0.5.15lorg3.95-1.git522.1 -- convert to systemd - -* Wed Apr 13 2011 Panu Matilainen - 0.5.15lorg3.95-0.git522.1 -- new upstream snapshot that has an actual chance of working... -- drop now unnecessary pile of patches -- replace upstart with systemd in rpmpriorities - -* Mon Feb 07 2011 Fedora Release Engineering - 0.5.15lorg3.95-0.git416.7.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Panu Matilainen - 0.5.15lorg3.95-0.git416.7 -- stitch it up to build with rpm 4.9.0 - -* Wed Jul 21 2010 David Malcolm - 0.5.15lorg3.95-0.git416.6.1 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Dec 07 2009 Panu Matilainen - 0.5.15lorg3.95-0.git416.6 -- rebuild for rpm 4.8.0 - -* Fri Mar 06 2009 Panu Matilainen - 0.5.15lorg3.95-0.git416.4 -- rebuild for rpm 4.7.0 - -* Mon Feb 23 2009 Fedora Release Engineering - 0.5.15lorg3.95-0.git416.3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Dec 31 2008 Panu Matilainen - 0.5.15lorg3.95-0.git416.3 -- trim down ancient cruft in rpmpriorities (#444287) -- depend on system-release instead of fedora-release (#474911) -- look into provides when looking for DistroVerPkg - -* Wed Dec 31 2008 Panu Matilainen - 0.5.15lorg3.95-0.git416.2 -- dont enable update "service" by default (#445096) - -* Tue Dec 23 2008 Panu Matilainen - 0.5.15lorg3.95-0.git416.1 -- Update to upstream snapshot to get something remotely working... -- Link to external Lua to match what rpm uses (#470728) -- Support varying filenames in repomd (#469805) - -* Mon Dec 15 2008 Lubomir Rintel - 0.5.15lorg3.94-6 -- Fix internal lua crash, link against system lua 5.1 - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.5.15lorg3.94-5 -- Rebuild for Python 2.6 - -* Fri Aug 1 2008 Axel Thimm - 0.5.15lorg3.94-4 -- Support for rpm 4.6 (Caolan McNamara ). - -* Fri Feb 22 2008 Panu Matilainen 0.5.15lorg3.94-3 -- add missing include for gcc 4.3 (#433982) -- remove bogus build dependencies from ancient times - -* Mon Feb 18 2008 Fedora Release Engineering - 0.5.15lorg3.94-2 -- Autorebuild for GCC 4.3 - -* Fri Jan 11 2008 Panu Matilainen 0.5.15lorg3.94-1 -- update to 0.5.15lorg3.94, should fix #222927, #246866, #279921, and #419811 -- update rpmpriorities to match current package set (#426143) - -* Fri Jan 04 2008 Panu Matilainen 0.5.15lorg3.93-5 -- fix build with gcc 4.3 - -* Mon Nov 19 2007 Panu Matilainen 0.5.15lorg3.93-4 -- Fix assert failure when repomd.xml isn't available locally (#389361) - -* Fri Nov 16 2007 Panu Matilainen 0.5.15lorg3.93-3 -- Hackery to help (multilib) obsoletes (#353271) -- Drop termcap + libtermcap from rpmpriorities to avoid installing needlessly -- Drop docbook-utils dependency and hackery, no longer needed - -* Thu Aug 23 2007 Panu Matilainen 0.5.15lorg3.93-2 -- gah, need to buildrequire gawk now... - -* Thu Aug 23 2007 Panu Matilainen 0.5.15lorg3.93-1 -- update to 0.5.15lorg3.93 (#253170) -- -devel requires pkgconfig due to .pc addition -- another license correction per latest guidelines -- cronjob is not a config file - -* Fri Aug 3 2007 Panu Matilainen -- License clarification -- Include Lua license in documentation - -* Thu Aug 2 2007 Axel Thimm - 0.5.15lorg3.92-2 -- Fix Fedora bug #249323. - -* Sun Jul 08 2007 Panu Matilainen - 0.5.15lorg3.92-1 -- update to 0.5.15lorg3.92 -- drop broken GPG keys, they belong to the config package anyway -- buildrequire sqlite-devel for repomd sqlite extension support -- add changelog to docs - -* Sun Jun 3 2007 Axel Thimm - 0.5.15lorg3.2-10 -- Make autoupdates a bit more quiet (Pierre Ossman - ). - -* Sat Dec 23 2006 Axel Thimm - 0.5.15lorg3.2-9 -- Add a patch to notify user and rebuild the cache on cache - corruption. - -* Sat Dec 9 2006 Axel Thimm - 0.5.15lorg3.2-8.1 -- Rebuild against python 2.5. - -* Thu Nov 23 2006 Axel Thimm - 0.5.15lorg3.2-8 -- Fix ppc mapping (#210833). -- make-up. - -* Sat Sep 16 2006 Axel Thimm - 0.5.15lorg3.2-7 -- Un%%ghost pyo files. - -* Thu Jun 22 2006 Axel Thimm - 0.5.15lorg3.2-6 -- Update to 0.5.15lorg3.2. - -* Mon May 22 2006 Axel Thimm -- Update to 0.5.15lorg3.1. - -* Sat May 20 2006 Axel Thimm -- Update to 0.5.15lorg3.1-rc2. -- Move some FC specific config bits to fedora-package-config-apt. -- Remove some sources that can be found in upstream now. - -* Thu May 11 2006 Axel Thimm - 0.5.15lorg3-2.1 -- Remove bogus final s from default(s).conf (Ville). - -* Mon May 8 2006 Axel Thimm - 0.5.15lorg3-2 -- Split off configuration files from apt. - -* Tue Apr 25 2006 Axel Thimm - 0.5.15lorg3-1 -- Update to 0.5.15lorg3 final. -- Fix URL. - -* Wed Apr 19 2006 Ralf Corsépius -- 0.5.15lorg3-rc2. - -* Mon Apr 10 2006 Ville Skyttä -- Remove mirror select remainders (thanks to Panu). - -* Sun Apr 9 2006 Ville Skyttä - 0.5.15lorg3-0.3.rc1 -- 0.5.15lorg3-rc1. -- Trim pre-2005 changelog entries. - -* Sun Apr 09 2006 Panu Matilainen -- use /var/lib/apt instead of obsolete /var/state/apt -- support FC4 as well - -* Fri Apr 7 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre4 -- 0.5.15lorg3-pre4. - -* Fri Mar 24 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre3 -- 0.5.15lorg3-pre3. - -* Wed Mar 22 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre2 -- Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. -- Don't import the "Old RHL key" by default. - -* Wed Mar 22 2006 Panu Matilainen -- 0.5.15lorg3-pre2 -- set distroverpkg to fedora-release -- add distro version and arch independent default source list entries for - fedora core, extras + updates -- remove old nasty fedora.us-time hacks from post scriptlets - -* Sun Mar 19 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre1 -- Fix Allow-Duplicated* default.conf bugs introduced in previous version. - -* Sun Mar 19 2006 Ville Skyttä - 0.5.15lorg3-0.1.pre1 -- 0.5.15lorg3-pre1: preliminary multilib and repomd support. -- Update config for kernel and module packages. -- Don't ship static libraries. -- Don't mark init script as config. -- Don't build -groupinstall for now. -- Clean up dependency lists for FC5+. -- Specfile cleanup. - -* Sun Nov 13 2005 Ville Skyttä - 0.5.15cnc7-7 -- Rebuild against new OpenSSL. - -* Wed Jun 22 2005 Ville Skyttä - 0.5.15cnc7-6 -- Drop fedora.us GPG key and vendors.list entry. -- Remove mirror list stuff (#161042). -- Drop no longer needed explicit python-abi dependency. - -* Thu Apr 28 2005 Ville Skyttä - 0.5.15cnc7-5 -- Fix apt-shell "install kernel" crash (#155990, Panu Matilainen). - -* Tue Apr 19 2005 Seth Vidal -- tobuild test - -* Fri Apr 1 2005 Michael Schwendt - 0.5.15cnc7-3 -- Include apt-pkg includedir in -devel package - -* Sat Mar 26 2005 Ville Skyttä - 0.5.15cnc7-2 -- 0.5.15cnc7, drop patches applied upstream. -- Fix groupinstall config file permissions. -- Various specfile and build cleanups and typo fixes. - -* Sat Mar 19 2005 Ville Skyttä -- Apply hack against missing libselinux-devel dep in rpm-devel for rpm 4.4 too. - -* Wed Feb 16 2005 Ville Skyttä - 0:0.5.15cnc6-16.r362 -- Make mirror-select.lua write commented out rpm-src entries for Extras (Panu). -- Add Extras GPG key (Panu), and add it to fedora-vendors.list. -- Drop not-installed Fedora Legacy key from SRPM. -- Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel - packages take care of that automatically (Panu). - -* Sat Jan 29 2005 Warren Togami - 0:0.5.15cnc6-15.r362 -- ExcludeArch: ppc64 - -* Fri Jan 28 2005 Ville Skyttä - 0:0.5.15cnc6-14.r362 -- Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in - apt.conf.d/default.conf. - -* Sun Jan 23 2005 Ville Skyttä - 0:0.5.15cnc6-13.r362 -- Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf. - -* Mon Jan 17 2005 Ville Skyttä - 0:0.5.15cnc6-12.r362 -- Clean up -python packaging, make everything honor %%{__python}. -- Build with dependency tracking disabled. -- "Revert" rpmpriorities and libselinux build-dep stuff to Panu's version. -- Add experimental auto-generation of rpmpriorities, but don't use it yet. -- Fix up mirror-select.conf creation. +* Mon Dec 16 22:10:42 EST 2019 Neal Gompa - 1.9.4-1 +- Switch from apt-rpm to apt from Debian and rebase to v1.9.4 + + This drops rpm support from apt +- Truncate changelog due to complete spec rewrite and replacement of apt implementation diff --git a/apt_preferences b/apt_preferences deleted file mode 100644 index e69de29..0000000 --- a/apt_preferences +++ /dev/null diff --git a/comps2prio.xsl b/comps2prio.xsl deleted file mode 100644 index 7b40050..0000000 --- a/comps2prio.xsl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - Essential: - - - - - - - - - diff --git a/default.conf b/default.conf deleted file mode 100644 index b9d697a..0000000 --- a/default.conf +++ /dev/null @@ -1,57 +0,0 @@ -// -// These are "factory defaults", DO NOT CHANGE! -// Put your customizations to /etc/apt/apt.conf instead, those will -// override any setting in here. -// - -APT -{ - // Options for apt-get - Get - { - Show-Versions "true"; - } -}; - -RPM -{ - // Always check GPG keys and automatically suggest to import new ones - GPG::Check "true"; - GPG::Import-Missing "true"; - GPG::KeysPath "/etc/pki/rpm-gpg"; -}; - -// Options for the downloading routines -Acquire -{ - http::User-Agent "APT-HTTP/1.3"; -}; - -Scripts -{ - PM - { - Pre { "gpg-check.lua"; }; - Post { "upgradevirt.lua"; }; - }; - AptGet - { - Upgrade { "upgradevirt.lua"; }; - DistUpgrade {"upgradevirt.lua"; }; - Install::SelectPackage { "upgradevirt.lua"; }; - Install::PreResolve { "upgradevirt.lua"; }; - Install::TranslateArg { "upgradevirt.lua"; }; - }; - Synaptic - { - DistUpgrade { "upgradevirt.lua"; }; - } -} - -// upgradevirt.lua specific item - make newly installed kernel default -Kernel -{ - // As of FC3+, the kernel packages take care of this automatically - //Set-Default "true"; - Module-Prefix { "kernel-module-"; }; -} diff --git a/gpg-check.lua b/gpg-check.lua deleted file mode 100644 index 905ed59..0000000 --- a/gpg-check.lua +++ /dev/null @@ -1,188 +0,0 @@ -if confget("RPM::GPG::Check/b", "true") == "false" then - return -end - -if table.getn(files_install) < 1 then - return -end - -hash = '##############################' -hashestotal = string.len(hash) -interactive = confget("RPM::Interactive/b", "true") -quiet = tonumber(confget("quiet", 0)) -keyspath = confget("RPM::GPG::KeysPath/f", "/etc/pki/rpm-gpg") - -function printhash(amount, total) - percent = amount/total*100 - if interactive == "true" then - nrhash = hashestotal - hashestotal / total * amount - line = string.format("%-31s[%3d%%]", string.sub(hash, nrhash), percent) - io.stdout.write(io.stdout, line) - io.stdout.flush(io.stdout) - for i = 1, string.len(line) do - io.stdout.write(io.stdout, '\b') - end - else - io.stdout.write(io.stdout, string.format("%%%% %f\n", percent)) - end -end - -function showerrors(i, msg) - apterror(msg) -end - -good = 1 -unknown = 0 -illegal = 0 -unsigned = 0 -missing = 0 -errors = {} -missings = {} - -skiplist = confgetlist("RPM::GPG::Skip-Check", "") - --- Results are stored in global variables -function gpgcheck(silent) - good = 1 - unknown = 0 - illegal = 0 - unsigned = 0 - missing = 0 - errors = {} - missings = {} - - if not silent then - io.stdout.write(io.stdout, string.format("%-41s", _("Checking GPG signatures..."))) - if interactive == "false" then - io.stdout.write(io.stdout, '\n') - end - end - - for i, file in ipairs(files_install) do - local skipthis = false - for j, skip in ipairs(skiplist) do - start = string.find(pkgname(pkgs_install[i]), skip) - if start then - skipthis = true - aptwarning(_("Skipped GPG check on ")..pkgname(pkgs_install[i])) - break - end - end - - if not silent and quiet == 0 then - printhash(i, table.getn(files_install)) - end - - if skipthis == false then - local inp = io.popen("LANG=C /bin/rpm --checksig "..file.." 2>&1") - for line in inp.lines(inp) do - if string.find(line, "rpmReadSignature") then - table.insert(errors, _("Illegal signature ")..line) - illegal = illegal + 1 - good = nil - elseif string.find(line, " NOT OK") then - local index = string.find(line, "#") - if string.find(line, "MISSING") and index then - local keyid = string.lower(string.sub(line, index+1, index+8)) - table.insert(errors, _("Missing key ")..line) - if not missings[keyid] then - missings[keyid] = {} - end - table.insert(missings[keyid], file) - missing = missing + 1 - good = nil - else - table.insert(errors, _("Unknown error ")..line) - unknown = unknown + 1 - good = nil - end - elseif string.find(line, " OK") then - if string.find(line, " gpg") or string.find(line, " pgp") then - break - else - table.insert(errors, _("Unsigned ")..line) - unsigned = unsigned + 1 - good = nil - end - else - table.insert(errors, _("Unknown error ")..line) - unknown = unknown + 1 - good = nil - end - end - io.close(inp) - end - end - if not silent and interactive == "true" then - io.stdout.write(io.stdout, '\n') - end -end - -gpgcheck(false) - -if not good and confget("RPM::GPG::Import-Missing/b", "true") == "true" then - -- Print list of missing keys - for i, msglist in pairs(missings) do - for j, file in pairs(msglist) do - print(_(" missing key #")..i.._(" for ")..file) - end - end - - -- Search for missing keys - local keysimported = 0 - local files = posix.dir(keyspath) - for i, file in ipairs(files) do - -- Get the Key ID - local keyid = nil - local inp = io.popen("LANG=C /usr/bin/gpg --no-options --no-default-keyring --keyring /dev/null --secret-keyring /dev/null "..keyspath.."/"..file.." 2>&1") - for line in inp.lines(inp) do - if string.sub(line, 1, 4) == "pub " then - keyid = string.lower(string.sub(line, 12, 19)) - end - end - io.close(inp) - - if keyid and missings[keyid] then - -- Note: Single kay could be imported several times - -- So neither pkgfind() nor `rpm -e --test` can be used - local ret = os.execute("LANG=C rpm -q gpg-pubkey-"..keyid.." > /dev/null 2>&1") - if ret == 0 then - aptwarning(_("Missing gpg key is already installed: #")..keyid) - else - local doimport = false - if confget("APT::Get::Assume-Yes/b", "false") == "true" then - doimport = true - else - io.stdout.write(io.stdout, _("Missing gpg key found").." ("..file..": #"..keyid..") ".._("Import it? [Y/n] ")) - local answer = io.read() - answer = string.lower(string.sub(answer, 1, 1)) - doimport = answer == "y" or answer == "" - end - - if doimport then - local execpath = "LANG=C rpm --import "..keyspath.."/"..file - if quiet then - execpath = execpath .. " > /dev/null 2>&1" - end - if os.execute(execpath) > 0 then - print(_("Error importing GPG key")) - else - missings[keyid] = nil - keysimported = keysimported + 1 - end - end - end - end - end - - if keysimported > 0 then - gpgcheck(true) - end -end - -if not good then - table.foreach(errors, showerrors) - apterror(_("Error(s) while checking package signatures:\n"..unsigned.." unsigned package(s)\n"..missing.." package(s) with missing signatures\n"..illegal.." package(s) with illegal/corrupted signatures\n"..unknown.." unknown error(s)")) -end - --- vim::sts=4:sw=4 diff --git a/preserve-conf.lua b/preserve-conf.lua deleted file mode 100644 index 47ae5b4..0000000 --- a/preserve-conf.lua +++ /dev/null @@ -1,18 +0,0 @@ -if confget("RPM::Preserve-Config/b", "false") == "true" then - num = 0 - pkgs = pkglist() - for i, pkg in ipairs(pkgs) do - if statinstall(pkg) then - inp = io.popen("LANG=C /bin/rpm -V --nodeps --nodigest --noscripts --nosignature "..pkgname(pkg).." 2> /dev/null") - for line in inp.lines(inp) do - if string.byte(line, 10) == string.byte("c") then - num = num + 1 - markkeep(pkg) - end - end - end - end - if num > 0 then - print("\nHolding back "..num.." packages because of changed configuration") - end -end diff --git a/rpmpriorities b/rpmpriorities deleted file mode 100644 index 46fa2fc..0000000 --- a/rpmpriorities +++ /dev/null @@ -1,22 +0,0 @@ -Essential: - grub - libgcc - rpm - rsyslog - glibc - shadow-utils - coreutils - bash - vim-minimal - passwd - util-linux-ng - basesystem - setup - e2fsprogs - pam - procps - initscripts - filesystem - system-release - udev - systemd diff --git a/sources b/sources index 1a7c11f..db01c40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c828d65f598d94186c41c5942fded87 apt-0.5.15lorg3.95.git522.tar.bz2 +SHA512 (apt-1.9.4.tar.gz) = 26f6fea36f2c00aa8e1a16c41c693076dd237150277df1d4ac2ee4c668b51807e82e0bc7f2c9516416ba134f9ab2d11e31ddccf4af53c72677bf72487d695d57 diff --git a/sources.list b/sources.list deleted file mode 100644 index d7607ec..0000000 --- a/sources.list +++ /dev/null @@ -1 +0,0 @@ -# Add any local / 3rd party repositories here.. diff --git a/upgradevirt.lua b/upgradevirt.lua deleted file mode 100755 index cc3893f..0000000 --- a/upgradevirt.lua +++ /dev/null @@ -1,198 +0,0 @@ - -if confget("RPM::Upgrade-Virtual/b", "false") == "false" then - return -end - -knames = { "hugemem", "bigmem", "enterprise", "smp", "BOOT" } - --- get kernel package name for running kernel (kernel-smp, kernel, etc) -function get_kerneltype() - for i, ktype in ipairs(knames) do - if string.find(posix.uname("%r"), ktype) then - return ktype - end - end - -- it's either unknown type or normal UP system - return "" -end - --- get package name -function get_kernelname() - suffix = get_kerneltype() - if suffix == "" then - return "kernel" - else - return "kernel-"..suffix - end -end - --- if grubby is available set default kernel to version -function set_default(version) - if not posix.access('/sbin/grubby', 'x') then - return - end - grubby = io.popen("LANG=C /sbin/grubby --default-kernel") - for line in grubby.lines(grubby) do - -- don't touch the default if it's not a linux system - if string.find(line, "vmlinuz") then - ktype = get_kerneltype() - vmlinuz = '/boot/vmlinuz-'..version..ktype - if posix.access(vmlinuz, 'f') then - print(_("Setting "..vmlinuz.." as new default kernel.")) - os.execute('/sbin/grubby --set-default='..vmlinuz) - else - aptwarning(_("Unable to set new default kernel "..vmlinuz)) - end - end - end -end - --- find + mark for install any packages where uname -r is part of pkg name --- eg external kernel modules -function upgrade_kernel_modules(new_version) - modprefix = confgetlist("Kernel::Module-Prefix") - if not new_version or not modprefix then - return - end - - seenpkgs = {} - pkgs = pkglist() - for i, pkg in ipairs(pkgs) do - -- oh fun.. loop through all installed packages and see there are - -- any which provide module-prefix, try to install version matching - -- our new kernel - if not pkgisvirtual(pkg) and pkgvercur(pkg) then - ver = pkgvercur(pkg) - for j, prov in ipairs(verprovlist(ver)) do - for x, prefix in ipairs(modprefix) do - if string.sub(prov.name, 1, string.len(prefix)) == prefix then - inst = pkgfind(prov.name.."-"..new_version) - if inst then - markinstall(inst) - elseif not seenpkgs[prov.name] == true then - print(_("WARNING: "..prov.name.." not available for kernel "..new_version.."!")) - end - seenpkgs[prov.name] = true - end - end - end - end - end -end - - --- find all virtualized packages, their versions and if they're installed -function find_instonly_pkgs() - pkgs = {} - for i, pkg in ipairs(pkglist()) do - idx = string.find(pkgname(pkg), "#") - ver = pkgvercur(pkg) - if idx and not pkgisvirtual(pkg) then - name = string.sub(pkgname(pkg), 1, idx-1) - if not ver then - ver = pkgvercand(pkg) - end - -- new entry - if not pkgs[name] then - tmp = {} - tmp.pkg = pkg - tmp.ver = ver - tmp.inst = false - pkgs[name] = tmp - end - if pkgvercur(pkg) then - pkgs[name].inst = true - end - -- mark it as latest if newer than what already known - if ver and verstrcmp(verstr(ver), verstr(pkgs[name].ver)) > 0 then - pkgs[name].ver = ver - pkgs[name].pkg = pkg - end - end - end - return pkgs -end - --- mark installed virtualized packages for "upgrade" -function mark_upgrade(name, pkg) - kname = get_kernelname() - if pkg.inst and not pkgvercur(pkg.pkg) then - markinstall(pkg.pkg) - if name == kname and not pkgvercur(pkg.pkg) then - confset('Kernel::New-Version', verstr(pkg.ver)) - end - end -end - --- find the latest version of given virtual pkg for installation -function mark_install(virtualpkg) - kname = get_kernelname() - pkgs = find_instonly_pkgs() - for name in pkgs do - if name == virtualpkg then - selected = pkgs[name].pkg - end - end - if virtualpkg == kname and not pkgvercur(pkgs[virtualpkg].pkg) then - confset('Kernel::New-Version', verstr(pkgs[virtualpkg].ver)) - end -end - --- normal install operation -if script_slot == 'Scripts::AptGet::Install::SelectPackage' then - modprefix = confgetlist('Kernel::Module-Prefix') - for i, prefix in ipairs(modprefix) do - if string.find(virtualname, prefix, 1, true) then - moduname = virtualname.."-"..posix.uname("%r") - modpkg = pkgfind(moduname) - if modpkg then - selected = modpkg - else - apterror(_("Couldn't find package "..moduname)) - return - end - end - end - mark_install(virtualname) - return -elseif script_slot == 'Scripts::AptGet::Install::PreResolve' then - kname = get_kernelname() - if not confexists('Kernel::New-Version') then - for i, pkg in ipairs(pkglist()) do - idx = string.find(pkgname(pkg), "#") - if statinstall(pkg) and idx then - name = string.sub(pkgname(pkg), 1, idx-1) - if kname == name and not pkgvercur(pkg) then - confset('Kernel::New-Version', verstr(pkgvercand(pkg))) - end - end - end - end - if confexists('Kernel::New-Version') then - upgrade_kernel_modules(confget('Kernel::New-Version')) - end --- if there's no virtual provide without the version in the name --- we need to match it here instead of selectpackage -elseif script_slot == 'Scripts::AptGet::Install::TranslateArg' then - modprefix = confgetlist('Kernel::Module-Prefix') - for i, prefix in ipairs(modprefix) do - if string.find(argument, prefix, 1, true) then - translated = argument.."-"..posix.uname("%r") - end - end - return -elseif script_slot == 'Scripts::AptGet::Upgrade' or - script_slot == 'Scripts::AptGet::DistUpgrade' then - pkgs = find_instonly_pkgs() - table.foreach(pkgs, mark_upgrade) - if confexists('Kernel::New-Version') then - upgrade_kernel_modules(confget('Kernel::New-Version')) - end -elseif script_slot == 'Scripts::PM::Post' then - if confget('Kernel::Set-Default/b', "false") == "true" and - confexists('Kernel::New-Version') then - set_default(confget('Kernel::New-Version')) - end -end - --- vim:ts=4:sw=4 diff --git a/vendors.list b/vendors.list deleted file mode 100644 index e69de29..0000000 --- a/vendors.list +++ /dev/null